diff --git a/src/main/java/ui/PanelKeyListener.java b/src/main/java/ui/PanelKeyListener.java
index 2bede92afa866e517e053ac90b3c1e7f15f0dd06..0dd929c2e05547a08bca45ffe669e0348163fb62 100644
--- a/src/main/java/ui/PanelKeyListener.java
+++ b/src/main/java/ui/PanelKeyListener.java
@@ -26,13 +26,15 @@ public class PanelKeyListener implements KeyListener {
 			tdp.leftComponent();
 		if (arg0.getKeyCode() == KeyEvent.VK_RIGHT && arg0.isShiftDown())
 			tdp.rightComponent();
-		if (arg0.getKeyCode() == KeyEvent.VK_ESCAPE && tdp.mode == TDiagramPanel.ADDING_CONNECTOR) {
+		if (arg0.getKeyCode() == KeyEvent.VK_ESCAPE) {
 			if (tdp.mode == TDiagramPanel.ADDING_CONNECTOR) {
                 tdp.mode = TDiagramPanel.NORMAL;
                 tdp.stopAddingConnector(true);
                 tdp.getGUI().setEditMode();
                 tdp.repaint();
-            } else {
+            } 
+			if (tdp.select){
+            	tdp.tdmm.setSelection(-1, -1);
                 tdp.getGUI().setEditMode();
                 tdp.repaint();
             }