diff --git a/resources/css/common.css b/resources/css/common.css
index 29cbb3142..6e3b12ce2 100644
--- a/resources/css/common.css
+++ b/resources/css/common.css
@@ -1450,11 +1450,11 @@ a.tag:hover {
 
 /* Hide scrollbar for IE, Edge and Firefox */
 .hide-scrollbar {
-  -ms-overflow-style: none; /* IE and Edge */
-  scrollbar-width: none; /* Firefox */
+    -ms-overflow-style: none;  /* IE and Edge */
+    scrollbar-width: none !important;  /* Firefox */
 }
 
 /* Hide scrollbar for Chrome, Safari and Opera */
 .hide-scrollbar::-webkit-scrollbar {
-  display: none;
+    display: none;
 }
diff --git a/src/main/frontend/mixins.cljs b/src/main/frontend/mixins.cljs
index 90aaa15d2..c43d6ea41 100644
--- a/src/main/frontend/mixins.cljs
+++ b/src/main/frontend/mixins.cljs
@@ -61,12 +61,6 @@
                  ;; If the click target is outside of current node
                   (when-not (dom/contains dom-node (.. e -target))
                     (on-hide state e :click))))
-        (listen state dom-node "keydown"
-                (fn [e]
-                  (case (.-keyCode e)
-                   ;; Esc
-                    27 (on-hide state e :esc)
-                    nil)))
         (when visibilitychange?
           (listen state js/window "visibilitychange"
                   (fn [e]
@@ -135,7 +129,7 @@
      ;; :will-unmount (fn [state]
      ;;                 (detach state)
      ;;                 state)
-     })))
+})))
 
 (defn modal
   [k]