2 files changed, 9 insertions, 8 deletions
diff --git a/gui.js b/gui.js
index e14dcd3..23a2250 100644
--- a/gui.js
+++ b/gui.js
@@ -69,7 +69,7 @@ SpeechBubbleMorph*/
 
 // Global stuff ////////////////////////////////////////////////////////
 
-modules.gui = '2014-July-08';
+modules.gui = '2014-July-11';
 
 // Declarations
 
@@ -1833,23 +1833,23 @@ IDE_Morph.prototype.duplicateSprite = function (sprite) {
 
 IDE_Morph.prototype.removeSprite = function (sprite) {
     var idx = this.sprites.asArray().indexOf(sprite) + 1;
-
+    this.stage.threads.stopAllForReceiver(sprite);
     sprite.destroy();
     this.stage.watchers().forEach(function (watcher) {
         if (watcher.object() === sprite) {
             watcher.destroy();
         }
     });
-
-    if (idx < 1) {return; }
-
+    if (idx > 0) {
+        this.sprites.remove(idx);
+    }
+    this.createCorral();
+    this.fixLayout();
     this.currentSprite = detect(
         this.stage.children,
         function (morph) {return morph instanceof SpriteMorph; }
     ) || this.stage;
-    this.sprites.remove(this.sprites.asArray().indexOf(sprite) + 1);
-    this.createCorral();
-    this.fixLayout();
+
     this.selectSprite(this.currentSprite);
 };
 
diff --git a/history.txt b/history.txt
index ab67540..8e4344f 100755
--- a/history.txt
+++ b/history.txt
@@ -2194,3 +2194,4 @@ ______
 * Morphic: allow directly editing properties in inspector widgets
 * 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)