diff --git a/core/renderers/geras/info.js b/core/renderers/geras/info.js
index 4678c7215..a64ed5fef 100644
--- a/core/renderers/geras/info.js
+++ b/core/renderers/geras/info.js
@@ -185,8 +185,9 @@ Blockly.geras.RenderInfo.prototype.getInRowSpacing_ = function(prev, next) {
     return this.constants_.LARGE_PADDING;
   }
 
-  // Spacing between a non-input and the end of the row.
-  if (!Blockly.blockRendering.Types.isInput(prev) && !next) {
+  // Spacing between a non-input and the end of the row or a statement input.
+  if (!Blockly.blockRendering.Types.isInput(prev) && (!next ||
+      Blockly.blockRendering.Types.isStatementInput(next))) {
     // Between an editable field and the end of the row.
     if (Blockly.blockRendering.Types.isField(prev) && prev.isEditable) {
       return this.constants_.MEDIUM_PADDING;