diff --git a/internal_packages/composer/stylesheets/composer.less b/internal_packages/composer/stylesheets/composer.less
index fad4ded9a..5eb2876b3 100644
--- a/internal_packages/composer/stylesheets/composer.less
+++ b/internal_packages/composer/stylesheets/composer.less
@@ -17,6 +17,18 @@ body.platform-win32 {
         padding-top: 1px;
       }
     }
+    .composer-drop-cover {
+      border-radius: 0;
+    }
+    input, input:focus {
+      border: 0;
+    }
+  }
+  .floating-toolbar {
+    border-radius: 0;
+    input, input:focus {
+      border: 0;
+    }
   }
 }
 
@@ -473,13 +485,3 @@ body.platform-win32 {
     }
   }
 }
-body.platform-win32 {
-  .composer-inner-wrap {
-    .composer-drop-cover {
-      border-radius: 0;
-    }
-  }
-  .floating-toolbar {
-    border-radius: 0;
-  }
-}
diff --git a/static/inputs.less b/static/inputs.less
index 80bf7e93c..916cee633 100644
--- a/static/inputs.less
+++ b/static/inputs.less
@@ -56,8 +56,8 @@ body.platform-win32 {
       border-radius: 0;
     }
     &:focus {
-      box-shadow: 0;
-      border: 2px solid darken(@input-border, 10%);
+      box-shadow: 0 0 0;
+      border: 2px solid darken(@input-border, 20%);
     }
   }
 }