diff --git a/src/containers/blocks.jsx b/src/containers/blocks.jsx
index 5be1498e1..a53b48760 100644
--- a/src/containers/blocks.jsx
+++ b/src/containers/blocks.jsx
@@ -235,10 +235,12 @@ class Blocks extends React.Component {
     setBlocks (blocks) {
         this.blocks = blocks;
     }
-    handlePromptStart (message, defaultValue, callback, optTitle) {
+    handlePromptStart (message, defaultValue, callback, optTitle, optVarType) {
         const p = {prompt: {callback, message, defaultValue}};
-        p.prompt.title = optTitle ? optTitle : 'New Variable';
-        p.prompt.showMoreOptions = optTitle !== 'New Message';
+        p.prompt.title = optTitle ? optTitle :
+            this.ScratchBlocks.VARIABLE_MODAL_TITLE;
+        p.prompt.showMoreOptions =
+            optVarType !== this.ScratchBlocks.BROADCAST_MESSAGE_VARIABLE_TYPE;
         this.setState(p);
     }
     handlePromptCallback (data) {