diff --git a/core/renderers/common/info.js b/core/renderers/common/info.js
index ccd046978..4e2915ba0 100644
--- a/core/renderers/common/info.js
+++ b/core/renderers/common/info.js
@@ -531,6 +531,9 @@ Blockly.blockRendering.RenderInfo.prototype.addAlignmentPadding_ = function(row,
   if (lastSpacer) {
     lastSpacer.width += missingSpace;
     row.width += missingSpace;
+    if (row.hasExternalInput || row.hasStatement) {
+      row.widthWithConnectedBlocks += missingSpace;
+    }
   }
 };