4 files changed, 10 insertions, 6 deletions
diff --git a/gui.js b/gui.js
index 1d3c134..ffb414d 100644
--- a/gui.js
+++ b/gui.js
@@ -1725,7 +1725,7 @@ IDE_Morph.prototype.applySavedSettings = function () {
 
     // blocks zoom
     if (zoom) {
-        SyntaxElementMorph.prototype.setScale(zoom);
+        SyntaxElementMorph.prototype.setScale(Math.min(zoom, 12));
         CommentMorph.prototype.refreshScale();
         SpriteMorph.prototype.initBlocks();
     }
@@ -1857,7 +1857,7 @@ IDE_Morph.prototype.removeSprite = function (sprite) {
 
 IDE_Morph.prototype.userMenu = function () {
     var menu = new MenuMorph(this);
-    menu.addItem('help', 'nop');
+    // menu.addItem('help', 'nop');
     return menu;
 };
 
@@ -3493,7 +3493,7 @@ IDE_Morph.prototype.userSetBlocksScale = function () {
     new DialogBoxMorph(
         null,
         function (num) {
-            myself.setBlocksScale(num);
+            myself.setBlocksScale(Math.min(num, 12));
         }
     ).withKey('zoomBlocks').prompt(
         'Zoom blocks',
diff --git a/history.txt b/history.txt
index 8e4344f..541905e 100755
--- a/history.txt
+++ b/history.txt
@@ -2195,3 +2195,4 @@ ______
 * Blocks: change the color of the %pause symbol to be more yellowish
 * Threads: fixed #506, thanks @haritop, for both the report and for providing the fix!!
 * GUI: fixed #412 (incomplete sprite-removal)
+* GUI: fixed #507 (limit persistent block zoom to 12x), thanks Michael!
diff --git a/morphic.js b/morphic.js
index 6d93439..39b8741 100644
--- a/morphic.js
+++ b/morphic.js
@@ -6893,6 +6893,9 @@ MenuMorph.prototype.popup = function (world, pos) {
     if (world.activeMenu) {
         world.activeMenu.destroy();
     }
+    if (this.items.length < 1 && !this.title) { // don't show empty menus
+        return;
+    }
     world.add(this);
     world.activeMenu = this;
     this.fullChanged();
diff --git a/objects.js b/objects.js
index 1a9bb63..3cd3ca5 100644
--- a/objects.js
+++ b/objects.js
@@ -125,7 +125,7 @@ PrototypeHatBlockMorph*/
 
 // Global stuff ////////////////////////////////////////////////////////
 
-modules.objects = '2014-July-08';
+modules.objects = '2014-July-11';
 
 var SpriteMorph;
 var StageMorph;
@@ -2577,7 +2577,7 @@ SpriteMorph.prototype.userMenu = function () {
         menu = new MenuMorph(this);
 
     if (ide && ide.isAppMode) {
-        menu.addItem('help', 'nop');
+        // menu.addItem('help', 'nop');
         return menu;
     }
     menu.addItem("duplicate", 'duplicate');
@@ -5116,7 +5116,7 @@ StageMorph.prototype.userMenu = function () {
         myself = this;
 
     if (ide && ide.isAppMode) {
-        menu.addItem('help', 'nop');
+        // menu.addItem('help', 'nop');
         return menu;
     }
     menu.addItem("edit", 'edit');