1 files changed, 6 insertions, 1 deletions
diff --git a/java/src/IceGridGUI/Application/Root.java b/java/src/IceGridGUI/Application/Root.java
index 191118c1662..0e4f904c709 100755
--- a/java/src/IceGridGUI/Application/Root.java
+++ b/java/src/IceGridGUI/Application/Root.java
@@ -714,6 +714,7 @@ public class Root extends ListTreeNode
 	    if(confirm == JOptionPane.YES_OPTION)
 	    {
 		_coordinator.removeApplicationFromRegistry(_id);
+		_discardMe = true;
 	    }
 	}
 	else
@@ -917,13 +918,15 @@ public class Root extends ListTreeNode
     {
 	_live = false;
 
-	if(_registryUpdatesEnabled)
+	if(_registryUpdatesEnabled || _discardMe)
 	{
 	    return true;
 	}
 	else
 	{
 	    _coordinator.getMainPane().resetIcon(this);
+	    _coordinator.getCurrentTab().selected(); // only needed when 'this' 
+	                                             // corresponds to the current tab
 	    return false;
 	}
     }
@@ -1186,6 +1189,8 @@ public class Root extends ListTreeNode
     //
     private boolean _registryUpdatesEnabled = true;
 
+    private boolean _discardMe = false;
+
     //
     // True when any update was applies to this application 
     // (including children)