diff --git a/static/js/admin.js b/static/js/admin.js
index 5009ef715e..47982f1fbd 100644
--- a/static/js/admin.js
+++ b/static/js/admin.js
@@ -13,9 +13,10 @@ exports.show_or_hide_menu_item = function () {
         $(".organization-box [data-name='auth-methods']")
             .find("input, button, select, checked").attr("disabled", true);
         $(".organization-box [data-name='default-streams-list']")
-            .find("input, button, select").attr("disabled", true);
+            .find("input:not(.search), button, select").attr("disabled", true);
         $(".organization-box [data-name='filter-settings']")
             .find("input, button, select").attr("disabled", true);
+        $(".control-label-disabled").css("color", "#333333");
     }
 };
 
diff --git a/static/styles/components.css b/static/styles/components.css
index 7af9b502ad..0de4cb25c8 100644
--- a/static/styles/components.css
+++ b/static/styles/components.css
@@ -183,6 +183,12 @@
     border: 1px solid #eea236;
 }
 
+.new-style .button[disabled="disabled"]:hover {
+    background-color: #eee;
+    color: #5bb792;
+    border-color: #addcc9;
+}
+
 /* -- tab switcher -- */
 
 .new-style .tab-switcher {