diff --git a/core/blockly.js b/core/blockly.js
index 523944948..103c0b7f7 100644
--- a/core/blockly.js
+++ b/core/blockly.js
@@ -342,14 +342,14 @@ Blockly.hideChaff = function(opt_allowToolbox) {
   Blockly.Tooltip.hide();
   Blockly.WidgetDiv.hide();
   Blockly.DropDownDiv.hideWithoutAnimation();
-  // For now the trashcan flyout always autocloses because it overlays the
-  // trashcan UI (no trashcan to click to close it)
-  var workspace = Blockly.getMainWorkspace();
-  if (workspace.trashcan &&
-      workspace.trashcan.flyout_) {
-    workspace.trashcan.flyout_.hide();
-  }
   if (!opt_allowToolbox) {
+    var workspace = Blockly.getMainWorkspace();
+    // For now the trashcan flyout always autocloses because it overlays the
+    // trashcan UI (no trashcan to click to close it).
+    if (workspace.trashcan &&
+      workspace.trashcan.flyout_) {
+      workspace.trashcan.flyout_.hide();
+    }
     if (workspace.toolbox_ &&
         workspace.toolbox_.flyout_ &&
         workspace.toolbox_.flyout_.autoClose) {