diff --git a/blocks/text.js b/blocks/text.js
index 5054b66bf..af5a1f18e 100644
--- a/blocks/text.js
+++ b/blocks/text.js
@@ -313,6 +313,9 @@ Blockly.Blocks['text_getSubstring'] = {
         .appendField(menu, 'WHERE' + n);
     if (n == 1) {
       this.moveInputBefore('AT1', 'AT2');
+      if (this.getInput('ORDINAL1')) {
+        this.moveInputBefore('ORDINAL1', 'AT2');
+      }
     }
   }
 };