diff --git a/frontends/web/src/routes/market/swap/components/input-with-account-selector.module.css b/frontends/web/src/routes/market/swap/components/input-with-account-selector.module.css
index b305bd0e90..3816215db3 100644
--- a/frontends/web/src/routes/market/swap/components/input-with-account-selector.module.css
+++ b/frontends/web/src/routes/market/swap/components/input-with-account-selector.module.css
@@ -16,22 +16,40 @@
   max-width: 50%;
 }
 
-.accountSelectorCol > div {
+.accountSelectorCol > div { /* hack, would be good if GroupedAccountSelector had a prop to accept a className for the dropdown */
   /* removes space after groupedaccountselector inside inputwithaccountselector on desktop */
   margin-bottom: 0;
 }
 
 .inputCol {
   align-items: flex-end;
+  border: 1px solid transparent;
+  border-top-right-radius: var(--radius-xl);
+  border-bottom-right-radius: var(--radius-xl);
   display: flex;
   flex-basis: 50%;
   flex-direction: column;
   flex-grow: 0;
   flex-shrink: 0;
   justify-content: center;
+  margin-bottom: 0;
   max-width: 50%;
 }
 
+.inputCol:focus-within {
+  border: 1px solid var(--color-blue);
+}
+
+.inputCol input,
+.inputCol input:invalid,
+.inputComponent > div:has(input:invalid) { /* '> div' is a bit hack, would be nice to add class directly */
+  border-color: transparent;
+}
+
+.inputCol:has(input:invalid:not(:focus)) {
+  border-color: var(--color-error);
+}
+
 .inputWithUnit {
   align-items: baseline;
   display: flex;
@@ -61,10 +79,6 @@
   border-radius: 0;
 }
 
-.inputComponent > div:has(input:invalid) {
-  border-color: var(--color-blue);
-}
-
 .fiat {
   color: var(--color-gray);
   display: flex;
diff --git a/frontends/web/src/routes/market/swap/components/input-with-account-selector.tsx b/frontends/web/src/routes/market/swap/components/input-with-account-selector.tsx
index a12c0c16b3..647682bddf 100644
--- a/frontends/web/src/routes/market/swap/components/input-with-account-selector.tsx
+++ b/frontends/web/src/routes/market/swap/components/input-with-account-selector.tsx
@@ -68,7 +68,7 @@ export const InputWithAccountSelector = ({
           />
         )}
       </div>
-      <div className={style.inputCol}>
+      <label className={style.inputCol}>
         <div className={style.inputWithUnit}>
           <NumberInput
             transparent
@@ -94,7 +94,7 @@ export const InputWithAccountSelector = ({
             </>
           ) : null}
         </div>
-      </div>
+      </label>
     </div>
   );
 };
\ No newline at end of file