diff --git a/packages/scratch-gui/src/lib/make-toolbox-xml.js b/packages/scratch-gui/src/lib/make-toolbox-xml.js
index f0886e97218..c8a6fd9c132 100644
--- a/packages/scratch-gui/src/lib/make-toolbox-xml.js
+++ b/packages/scratch-gui/src/lib/make-toolbox-xml.js
@@ -23,6 +23,9 @@ const motion = function (isInitialSetup, isStage, targetId, colors) {
         ${isStage ? `
         <label text="${stageSelected}"></label>
         ` : `
+        <block type="button" />
+        <block type="joystick" />
+        ${blockSeparator}
         <block type="motion_movesteps">
             <value name="STEPS">
                 <shadow type="math_number">