diff --git a/editor/composer/src/res/EditorOverride.css b/editor/composer/src/res/EditorOverride.css
index 6ebe5e4153f8..1e0a85c61aae 100644
--- a/editor/composer/src/res/EditorOverride.css
+++ b/editor/composer/src/res/EditorOverride.css
@@ -64,7 +64,16 @@ a:link {
   color: -moz-hyperlinktext;
 }
 
-input, button, select, textarea {
+/* Allow double-clicks on these widgets to open properties dialogs
+   XXX except when the widget has disabled attribute */
+input, button, textarea {
+  -moz-user-select: all !important;
+  -moz-user-input: auto !important;
+  -moz-user-focus: none !important;
+}
+
+/* XXX Still need a better way of blocking other events to these widgets */
+select, input[disabled], input[type="checkbox"], input[type="radio"], input[type="file"] {
   -moz-user-select: all !important;
   -moz-user-input: none !important;
   -moz-user-focus: none !important;
diff --git a/editor/ui/composer/content/EditorOverride.css b/editor/ui/composer/content/EditorOverride.css
index 6ebe5e4153f8..1e0a85c61aae 100644
--- a/editor/ui/composer/content/EditorOverride.css
+++ b/editor/ui/composer/content/EditorOverride.css
@@ -64,7 +64,16 @@ a:link {
   color: -moz-hyperlinktext;
 }
 
-input, button, select, textarea {
+/* Allow double-clicks on these widgets to open properties dialogs
+   XXX except when the widget has disabled attribute */
+input, button, textarea {
+  -moz-user-select: all !important;
+  -moz-user-input: auto !important;
+  -moz-user-focus: none !important;
+}
+
+/* XXX Still need a better way of blocking other events to these widgets */
+select, input[disabled], input[type="checkbox"], input[type="radio"], input[type="file"] {
   -moz-user-select: all !important;
   -moz-user-input: none !important;
   -moz-user-focus: none !important;