diff --git a/src/main/java/ui/MainGUI.java b/src/main/java/ui/MainGUI.java
index d5d6218b602f1cbc20b0f2fb97db5eb67c9fbe1d..043a53da218e10413049320b67cbd514bc7d8c4c 100644
--- a/src/main/java/ui/MainGUI.java
+++ b/src/main/java/ui/MainGUI.java
@@ -8179,12 +8179,15 @@ public  class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
         }
 
         public void mousePressed(MouseEvent e) {
+        	activetdp.tdmm.setSelection(-1, -1);
             checkForPopup(e);
         }
         public void mouseReleased(MouseEvent e) {
+        	activetdp.tdmm.setSelection(-1, -1);
             checkForPopup(e);
         }
         public void mouseClicked(MouseEvent e) {
+        	activetdp.tdmm.setSelection(-1, -1);
             checkForPopup(e);
         }
 
diff --git a/src/main/java/ui/TDiagramPanel.java b/src/main/java/ui/TDiagramPanel.java
index b5ee0e78d7cdf978eb6683954c22a8a51cc9ca52..e906f43de7d17da5c04167ef898209d406bb9b67 100755
--- a/src/main/java/ui/TDiagramPanel.java
+++ b/src/main/java/ui/TDiagramPanel.java
@@ -3448,4 +3448,8 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
     public void setComponentPointed(TGComponent tgc) {
     	componentPointed = tgc;
     }
+    
+    public TDiagramMouseManager getMouseManager() {
+    	return tdmm;
+    }
 }
diff --git a/src/main/java/ui/TURTLEPanelPopupListener.java b/src/main/java/ui/TURTLEPanelPopupListener.java
index 2b868b37fbbdfeb364924459b060f57f68ec3aba..b4f9cefc1e8724dd0d01178bd49a3d2c840ad129 100755
--- a/src/main/java/ui/TURTLEPanelPopupListener.java
+++ b/src/main/java/ui/TURTLEPanelPopupListener.java
@@ -75,14 +75,17 @@ public class TURTLEPanelPopupListener extends MouseAdapter /* popup menus onto t
     }
 
     public void mousePressed(MouseEvent e) {
+    	mgui.getCurrentTDiagramPanel().getMouseManager().setSelection(-1, -1);
         checkForPopup(e);
     }
     
     public void mouseReleased(MouseEvent e) {
+    	mgui.getCurrentTDiagramPanel().getMouseManager().setSelection(-1, -1);
         checkForPopup(e);
     }
     
     public void mouseClicked(MouseEvent e) {
+    	mgui.getCurrentTDiagramPanel().getMouseManager().setSelection(-1, -1);
         checkForPopup(e);
     }
 
diff --git a/src/main/java/ui/avatarbd/AvatarBDBlock.java b/src/main/java/ui/avatarbd/AvatarBDBlock.java
index 9b259ddff4541f8f28f562b23e74e5b8137f8af1..f2bbe5300219718ddd4f0ccf806d64595a94b255 100644
--- a/src/main/java/ui/avatarbd/AvatarBDBlock.java
+++ b/src/main/java/ui/avatarbd/AvatarBDBlock.java
@@ -566,6 +566,7 @@ public class AvatarBDBlock extends TGCScalableWithInternalComponent implements S
         int textX = (int) (this.textX * this.tdp.getZoom ());
         if (iconIsDrawn) {
             if (GraphicLib.isInRectangle(_x, _y, x + width - iconSize - textX, y + textX, iconSize, iconSize)) {
+            	tdp.getMouseManager().setSelection(-1, -1);
                 tdp.selectTab(getValue());
                 return true;
             }
diff --git a/src/main/java/ui/iod/IODRefIOD.java b/src/main/java/ui/iod/IODRefIOD.java
index 7582491915660aaa92f4630651588079be024529..72c08780b5ddf59ce29a5ff375914b86604773a6 100755
--- a/src/main/java/ui/iod/IODRefIOD.java
+++ b/src/main/java/ui/iod/IODRefIOD.java
@@ -161,6 +161,7 @@ public class IODRefIOD extends TGCOneLineText {
         } else {
             ((InteractionOverviewDiagramPanel)tdp).createIODiagram(value);
         }
+        tdp.getMouseManager().setSelection(-1, -1);
         return true;
     }
 	
diff --git a/src/main/java/ui/iod/IODRefSD.java b/src/main/java/ui/iod/IODRefSD.java
index ad4856d044d93a733cb4a95343e30306b7ad7978..41ac75aaf127244bfb6471eabf33bd1428ef772e 100755
--- a/src/main/java/ui/iod/IODRefSD.java
+++ b/src/main/java/ui/iod/IODRefSD.java
@@ -158,6 +158,7 @@ public class IODRefSD extends TGCOneLineText {
         } else {
             ((InteractionOverviewDiagramPanel)tdp).createSequenceDiagram(value);
         }   
+        tdp.getMouseManager().setSelection(-1, -1);
         return true;
     }
 	
diff --git a/src/main/java/ui/tmlcompd/TMLCPrimitiveComponent.java b/src/main/java/ui/tmlcompd/TMLCPrimitiveComponent.java
index 2c7dd572598e570c8e7f1cb37e1145f14c1f34a3..64b36bf3cde455d306b104c670bb52a32d0e99fb 100755
--- a/src/main/java/ui/tmlcompd/TMLCPrimitiveComponent.java
+++ b/src/main/java/ui/tmlcompd/TMLCPrimitiveComponent.java
@@ -294,6 +294,7 @@ public class TMLCPrimitiveComponent extends TGCScalableWithInternalComponent imp
         // On the icon?
         if (iconIsDrawn) {
             if (GraphicLib.isInRectangle(_x, _y, x + width - iconSize - textX, y + textX, iconSize, iconSize)) {
+            	tdp.getMouseManager().setSelection(-1, -1);
                 tdp.selectTab(getValue());
                 return true;
             }
diff --git a/src/main/java/ui/tmlcp/TMLCPRefAD.java b/src/main/java/ui/tmlcp/TMLCPRefAD.java
index d6e31f5d4ec733ffe7971a4eee5c3991b711609a..31b1676a04e17be975398281d2c251cafc67e5bd 100755
--- a/src/main/java/ui/tmlcp/TMLCPRefAD.java
+++ b/src/main/java/ui/tmlcp/TMLCPRefAD.java
@@ -166,6 +166,7 @@ public class TMLCPRefAD extends TGCOneLineText {
         else {
             ( (TMLCPPanel)tdp ).createTMLCPDiagram( name );
         }
+        tdp.getMouseManager().setSelection(-1, -1);
         return true;
     }
 
diff --git a/src/main/java/ui/tmlcp/TMLCPRefSD.java b/src/main/java/ui/tmlcp/TMLCPRefSD.java
index 6441e6a16118ff7f76b913150a5790efb3d1336e..6de4589dc398b123fad1503a9210669ce46f81ee 100755
--- a/src/main/java/ui/tmlcp/TMLCPRefSD.java
+++ b/src/main/java/ui/tmlcp/TMLCPRefSD.java
@@ -164,7 +164,8 @@ public class TMLCPRefSD extends TGCOneLineText {
       }
 			else {
 				( (TMLCPPanel)tdp ).createTMLCPSequenceDiagram( name );
-			}   
+			}
+      tdp.getMouseManager().setSelection(-1, -1);
       return true;
     }