diff --git a/sdk/jme3-core/src/com/jme3/gde/core/scene/controller/SceneToolController.java b/sdk/jme3-core/src/com/jme3/gde/core/scene/controller/SceneToolController.java
index 59ec38483..b81a02874 100644
--- a/sdk/jme3-core/src/com/jme3/gde/core/scene/controller/SceneToolController.java
+++ b/sdk/jme3-core/src/com/jme3/gde/core/scene/controller/SceneToolController.java
@@ -301,8 +301,16 @@ public class SceneToolController implements AppState {
 
     public void cleanup() {
         detachSelectionShape();
-        cursor.removeFromParent();
-        grid.removeFromParent();
+        final Spatial cursor = this.cursor;
+        final Spatial grid = this.grid;
+        SceneApplication.getApplication().enqueue(new Callable<Void>() {
+
+            public Void call() throws Exception {
+                cursor.removeFromParent();
+                grid.removeFromParent();
+                return null;
+            }
+        });
         SceneApplication.getApplication().getStateManager().detach(this);
     }