diff --git a/core/renderers/zelos/constants.js b/core/renderers/zelos/constants.js
index eb2114472..81ebb784d 100644
--- a/core/renderers/zelos/constants.js
+++ b/core/renderers/zelos/constants.js
@@ -81,6 +81,11 @@ Blockly.zelos.ConstantProvider = function() {
    */
   this.NOTCH_OFFSET_LEFT = 3 * this.GRID_UNIT;
 
+  /**
+   * @override
+   */
+  this.MIN_BLOCK_WIDTH = 2 * this.GRID_UNIT;
+
   /**
    * @override
    */
@@ -115,7 +120,7 @@ Blockly.zelos.ConstantProvider = function() {
    * Minimum statement input spacer width.
    * @type {number}
    */
-  this.STATEMENT_INPUT_SPACER_MIN_WIDTH = 34.5 * this.GRID_UNIT;
+  this.STATEMENT_INPUT_SPACER_MIN_WIDTH = 40 * this.GRID_UNIT;
 
   /**
    * @override
diff --git a/core/renderers/zelos/info.js b/core/renderers/zelos/info.js
index 7e76690bc..3f1abf9ed 100644
--- a/core/renderers/zelos/info.js
+++ b/core/renderers/zelos/info.js
@@ -191,9 +191,15 @@ Blockly.zelos.RenderInfo.prototype.getSpacerRowHeight_ = function(
   }
   // Top and bottom rows act as a spacer so we don't need any extra padding.
   if ((Blockly.blockRendering.Types.isTopRow(prev))) {
+    if (!prev.hasPreviousConnection && !this.outputConnection) {
+      return this.constants_.SMALL_PADDING;
+    }
     return this.constants_.NO_PADDING;
   }
   if ((Blockly.blockRendering.Types.isBottomRow(next))) {
+    if (!this.outputConnection) {
+      return this.constants_.SMALL_PADDING;
+    }
     return this.constants_.NO_PADDING;
   }
   return this.constants_.MEDIUM_PADDING;