diff --git a/core/flyout_base.js b/core/flyout_base.js
index 4c5d467e1..685f5ad10 100644
--- a/core/flyout_base.js
+++ b/core/flyout_base.js
@@ -740,8 +740,12 @@ Blockly.Flyout.prototype.filterForCapacity_ = function() {
   var blocks = this.workspace_.getTopBlocks(false);
   for (var i = 0, block; block = blocks[i]; i++) {
     if (this.permanentlyDisabled_.indexOf(block) == -1) {
-      block.setDisabled(!this.targetWorkspace_
-          .isCapacityAvailable(Blockly.utils.getBlockTypeCounts(block)));
+      var disable = !this.targetWorkspace_
+          .isCapacityAvailable(Blockly.utils.getBlockTypeCounts(block));
+      while (block) {
+        block.setDisabled(disable);
+        block = block.getNextBlock();
+      }
     }
   }
 };