From 8e33ab39c4984eb272fd90af73e50e1570f7986d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jens=20M=C3=B6nig?= <jens@moenig.org>
Date: Thu, 2 Feb 2017 12:06:05 +0100
Subject: [PATCH] fixed #1650

---
 blocks.js   | 8 ++++++--
 history.txt | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/blocks.js b/blocks.js
index 98877ca4..06862baf 100644
--- a/blocks.js
+++ b/blocks.js
@@ -150,7 +150,7 @@ CustomCommandBlockMorph*/
 
 // Global stuff ////////////////////////////////////////////////////////
 
-modules.blocks = '2017-January-27';
+modules.blocks = '2017-February-02';
 
 var SyntaxElementMorph;
 var BlockMorph;
@@ -2515,9 +2515,13 @@ BlockMorph.prototype.userMenu = function () {
             function () {
                 var cpy = myself.fullCopy(),
                     nb = cpy.nextBlock(),
-                    ide = myself.parentThatIsA(IDE_Morph);
+                    ide = myself.parentThatIsA(IDE_Morph),
+                    blockEditor = myself.parentThatIsA(BlockEditorMorph);
                 if (nb) {nb.destroy(); }
                 cpy.pickUp(world);
+                if (!ide && blockEditor) {
+                    ide = blockEditor.target.parentThatIsA(IDE_Morph);
+                }
                 if (ide) {
                     world.hand.grabOrigin = {
                         origin: ide.palette,
diff --git a/history.txt b/history.txt
index 8816d23d..e2267ef7 100755
--- a/history.txt
+++ b/history.txt
@@ -3353,3 +3353,4 @@ Fixes:
 170202
 ------
 * Objects, BYOB: highly experimental custom block inheritance, under construction…
+* Blocks: fixed #1650