diff --git a/frontend/less/espo/bootstrap/forms.less b/frontend/less/espo/bootstrap/forms.less
index bbc108614e..9d087c31b5 100644
--- a/frontend/less/espo/bootstrap/forms.less
+++ b/frontend/less/espo/bootstrap/forms.less
@@ -121,13 +121,13 @@ output {
   color: @input-color;
   background-color: @input-bg;
   background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214
-  border: 1px solid @input-border;
-  border-radius: @input-border-radius; // Note: This has no effect on <select>s in some browsers, due to the limited stylability of <select>s in CSS.
-  .box-shadow(inset 0 1px 1px rgba(0,0,0,.075));
-  .transition(~"border-color ease-in-out .15s, box-shadow ease-in-out .15s");
+  //border: 1px solid @input-border;
+  //border-radius: @input-border-radius; // Note: This has no effect on <select>s in some browsers, due to the limited stylability of <select>s in CSS.
+  //.box-shadow(inset 0 1px 1px rgba(0,0,0,.075));
+  //.transition(~"border-color ease-in-out .15s, box-shadow ease-in-out .15s");
 
   // Customize the `:focus` state to imitate native WebKit styles.
-  .form-control-focus-espo();
+  //.form-control-focus-espo();
 
   // Placeholder
   .placeholder();
diff --git a/frontend/less/espo/elements/form.less b/frontend/less/espo/elements/form.less
index 8272833ab2..0cf78eaf91 100644
--- a/frontend/less/espo/elements/form.less
+++ b/frontend/less/espo/elements/form.less
@@ -13,6 +13,8 @@
     }
 
     box-shadow: var(--input-box-shadow);
+    .transition(~"border-color ease-in-out .15s, box-shadow ease-in-out .15s");
+    .form-control-focus-espo();
 }
 
 .selectize-input {