diff --git a/customize.dist/src/less2/include/forms.less b/customize.dist/src/less2/include/forms.less
index 67b937688..a7939eacd 100644
--- a/customize.dist/src/less2/include/forms.less
+++ b/customize.dist/src/less2/include/forms.less
@@ -118,7 +118,7 @@
             margin: 0;
         }
 
-        &:hover, &:not(:disabled):active, &:focus {
+        &:hover, &:not(:disabled):not(.disabled):active, &:focus {
             color: @alertify-btn-fg;
             border: 1px solid @alertify-btn-fg;
             background-color: lighten(@alertify-fore, 35%);
@@ -134,6 +134,8 @@
             border-color: @cryptpad_text_col;
             color: @cryptpad_text_col;
             &:hover, &:not(:disabled):active, &:focus {
+                border-color: @cryptpad_text_col;
+                color: @cryptpad_text_col;
                 background-color: #ccc;
             }
         }
@@ -143,6 +145,8 @@
             border-color: @colortheme_alertify-red-border;
             color: @colortheme_alertify-red-color;
             &:hover, &:not(:disabled):active, &:focus {
+                border-color: @colortheme_alertify-red-border;
+                color: @colortheme_alertify-red-color;
                 background-color: contrast(@colortheme_modal-bg, darken(@colortheme_alertify-red, 10%), lighten(@colortheme_alertify-red, 10%));
             }
         }
@@ -151,6 +155,7 @@
             border-color: @colortheme_alertify-red;
             color: @colortheme_alertify-red;
             &:hover, &:not(:disabled):active, &:focus {
+                border-color: @colortheme_alertify-red;
                 color: @colortheme_alertify-red-color;
                 background-color: contrast(@colortheme_modal-bg, darken(@colortheme_alertify-red, 10%), lighten(@colortheme_alertify-red, 10%));
             }
@@ -161,6 +166,8 @@
             border-color: @colortheme_alertify-green-border;
             color: @colortheme_alertify-green-color;
             &:hover, &:not(:disabled):active, &:focus {
+                border-color: @colortheme_alertify-green-border;
+                color: @colortheme_alertify-green-color;
                 background-color: contrast(@colortheme_modal-bg, darken(@colortheme_alertify-green, 10%), lighten(@colortheme_alertify-green, 10%));
             }
         }
@@ -171,6 +178,8 @@
             border-color: @colortheme_alertify-primary-border;
             font-weight: bold;
             &:hover, &:not(:disabled):active, &:focus {
+                color: @colortheme_alertify-primary-text;
+                border-color: @colortheme_alertify-primary-border;
                 background-color: contrast(@colortheme_modal-bg, darken(@colortheme_alertify-primary, 10%), lighten(@colortheme_alertify-primary, 10%));
             }
         }
@@ -180,6 +189,8 @@
             color: @cryptpad_text_col;
             background-color: transparent;
             &:hover, &:not(:disabled):active, &:focus {
+                border-color: @cryptpad_text_col;
+                color: @cryptpad_text_col;
                 background-color: fade(@cryptpad_text_col, 25%);
             }
         }
@@ -188,6 +199,8 @@
             border-color: @colortheme_alertify-cancel-border;
             color: @colortheme_alertify-cancel-border;
             &:hover, &:not(:disabled):active, &:focus {
+                border-color: @colortheme_alertify-cancel-border;
+                color: @colortheme_alertify-cancel-border;
                 background-color: fade(@colortheme_alertify-cancel-border, 25%);
             }
         }
@@ -213,5 +226,4 @@
             }
         }
     }
-
 }