diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/canvas/CanvasPanel.java b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/canvas/CanvasPanel.java
index 52364121..20e0b170 100644
--- a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/canvas/CanvasPanel.java	
+++ b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/canvas/CanvasPanel.java	
@@ -179,25 +179,7 @@ class CanvasPanel extends JComponent implements Autoscroll {
 		// // e.isShiftDown(), e
 		// // .isAltDown());
 		// }
-		// });
-		addMouseMotionListener(new MouseAdapter() {
-
-			@Override
-			public void mouseMoved(MouseEvent e) {
-				setCursor(plugInPort.getCursorAt(e.getPoint()));
-				plugInPort.mouseMoved(e.getPoint(), e.isControlDown(), e
-						.isShiftDown(), e.isAltDown());
-			}
-		});
-		addMouseListener(new MouseAdapter() {
-
-			@Override
-			public void mouseClicked(MouseEvent e) {
-				plugInPort.mouseClicked(e.getPoint(), e.getButton(), e
-						.isControlDown(), e.isShiftDown(), e.isAltDown(), e
-						.getClickCount());
-			}
-		});
+		// });		
 	}
 
 	// Autoscroll
diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/canvas/CanvasPlugin.java b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/canvas/CanvasPlugin.java
index bd3d6a73..97f8c1ec 100644
--- a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/canvas/CanvasPlugin.java	
+++ b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/canvas/CanvasPlugin.java	
@@ -146,6 +146,26 @@ public class CanvasPlugin implements IPlugIn, ClipboardOwner {
 					}
 				}
 			});
+
+			canvasPanel.addMouseMotionListener(new MouseAdapter() {
+
+				@Override
+				public void mouseMoved(MouseEvent e) {
+					canvasPanel.setCursor(plugInPort.getCursorAt(e.getPoint()));
+					plugInPort.mouseMoved(e.getPoint(), e.isControlDown(), e
+							.isShiftDown(), e.isAltDown());
+				}
+			});
+			
+			canvasPanel.addMouseListener(new MouseAdapter() {
+
+				@Override
+				public void mouseClicked(MouseEvent e) {
+					plugInPort.mouseClicked(e.getPoint(), e.getButton(), e
+							.isControlDown(), e.isShiftDown(), e.isAltDown(), e
+							.getClickCount());
+				}
+			});
 		}
 		return canvasPanel;
 	}
@@ -225,7 +245,7 @@ public class CanvasPlugin implements IPlugIn, ClipboardOwner {
 			popupMenu.add(getPasteAction());
 			popupMenu.addSeparator();
 			popupMenu.add(getEditSelectionAction());
-			popupMenu.add(getDeleteSelectionAction());			
+			popupMenu.add(getDeleteSelectionAction());
 			popupMenu.add(getGroupAction());
 			popupMenu.add(getUngroupAction());
 			popupMenu.add(getSendToBackAction());
diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/update.xml b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/update.xml
index 4f3c2a14..7a1788c8 100644
--- a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/update.xml	
+++ b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/update.xml	
@@ -1082,6 +1082,10 @@
 					<changeType>BUG_FIX</changeType>
 					<description>Pasted components are placed below traces</description>
 				</org.diylc.appframework.update.Change>
+				<org.diylc.appframework.update.Change>
+					<changeType>BUG_FIX</changeType>
+					<description>Right click changes selection</description>
+				</org.diylc.appframework.update.Change>
 				<org.diylc.appframework.update.Change>
 					<changeType>IMPROVEMENT</changeType>
 					<description>Clearer standing component (mainly diode) reversion</description>