diff --git a/src/main/java/ui/TDiagramMouseManager.java b/src/main/java/ui/TDiagramMouseManager.java
index eecb4575e9b484ecb5f6aa96b49adff18a94418b..c2f7f308527804c78c63afb1e2d4ca8461e6547b 100755
--- a/src/main/java/ui/TDiagramMouseManager.java
+++ b/src/main/java/ui/TDiagramMouseManager.java
@@ -133,6 +133,7 @@ public class TDiagramMouseManager extends MouseAdapter {//implements MouseListen
                 tdp.mode = TDiagramPanel.SELECTING_COMPONENTS;
                 tdp.setSelectingComponents(e.getX(), e.getY());
             }  else {
+            	tdp.mgui.actions[TGUIAction.ACT_DELETE].setEnabled(true);
                 // Resize, move, or make a connector
                 if (tgc.isUserResizable() && ((resizeInfo=tgc.getResizeZone(e.getX(), e.getY())) != 0)) {
                     actionMade = true;
@@ -466,6 +467,10 @@ public class TDiagramMouseManager extends MouseAdapter {//implements MouseListen
         //If one click is done for selection
         if ((selected == TGComponentManager.EDIT) && (e.getClickCount() == 1) && (e.getButton() == MouseEvent.BUTTON1)) {
         	setSelection(e.getX(), e.getY());
+        	if (tdp.select)
+        		tdp.mgui.actions[TGUIAction.ACT_DELETE].setEnabled(true);
+        	else
+        		tdp.mgui.actions[TGUIAction.ACT_DELETE].setEnabled(false);
         }
     }