diff --git a/core/events.js b/core/events.js
index bc301ddbe..ee401c99e 100644
--- a/core/events.js
+++ b/core/events.js
@@ -145,6 +145,15 @@ Blockly.Events.filter = function(queueIn, forward) {
           event1.newValue = event2.newValue;
           queue.splice(j, 1);
           j--;
+        } else if (event1.type == Blockly.Events.UI &&
+            event2.element == 'click' &&
+            (event1.element == 'commentOpen' ||
+             event1.element == 'mutatorOpen' ||
+             event1.element == 'warningOpen')) {
+          // Merge change events.
+          event1.newValue = event2.newValue;
+          queue.splice(j, 1);
+          j--;
         }
       }
     }
diff --git a/core/widgetdiv.js b/core/widgetdiv.js
index 804b4fa6b..817d15bac 100644
--- a/core/widgetdiv.js
+++ b/core/widgetdiv.js
@@ -82,7 +82,6 @@ Blockly.WidgetDiv.show = function(newOwner, rtl, dispose) {
   Blockly.WidgetDiv.DIV.style.top = xy.y + 'px';
   Blockly.WidgetDiv.DIV.style.direction = rtl ? 'rtl' : 'ltr';
   Blockly.WidgetDiv.DIV.style.display = 'block';
-  Blockly.Events.setGroup(true);
 };
 
 /**
@@ -98,7 +97,6 @@ Blockly.WidgetDiv.hide = function() {
     Blockly.WidgetDiv.dispose_ && Blockly.WidgetDiv.dispose_();
     Blockly.WidgetDiv.dispose_ = null;
     goog.dom.removeChildren(Blockly.WidgetDiv.DIV);
-    Blockly.Events.setGroup(false);
   }
 };