diff --git a/blocks/loops.js b/blocks/loops.js
index aeab721ac..4576d59a0 100644
--- a/blocks/loops.js
+++ b/blocks/loops.js
@@ -261,6 +261,9 @@ Blockly.Constants.Loops.CUSTOM_CONTEXT_MENU_CREATE_VARIABLES_GET_MIXIN = {
    * @this Blockly.Block
    */
   customContextMenu: function(options) {
+    if (this.isInFlyout){
+      return;
+    }
     var varName = this.getFieldValue('VAR');
     if (!this.isCollapsed() && varName != null) {
       var option = {enabled: true};
diff --git a/blocks/procedures.js b/blocks/procedures.js
index cb2cec226..b026be0f7 100644
--- a/blocks/procedures.js
+++ b/blocks/procedures.js
@@ -355,6 +355,9 @@ Blockly.Blocks['procedures_defnoreturn'] = {
    * @this Blockly.Block
    */
   customContextMenu: function(options) {
+    if (this.isInFlyout){
+      return;
+    }
     // Add option to create caller.
     var option = {enabled: true};
     var name = this.getFieldValue('NAME');
diff --git a/chromedriver/chromedriver b/chromedriver/chromedriver
new file mode 100755
index 000000000..9ccb03049
Binary files /dev/null and b/chromedriver/chromedriver differ