--- a/client/src/Iri.Modernisation.Controls/View/MenuableUserControl.cs	Tue Jan 05 15:53:48 2010 +0100
+++ b/client/src/Iri.Modernisation.Controls/View/MenuableUserControl.cs	Fri Jan 08 11:33:24 2010 +0100
@@ -18,9 +18,9 @@
         {
             MouseEnter += new MouseEventHandler(MenuableUserControl_MouseEnter);
             MouseLeave += new MouseEventHandler(MenuableUserControl_MouseLeave);
-            MouseLeftButtonDown += new MouseButtonEventHandler(MenuableUserControl_MouseLeftButtonDown);
-        
-            MouseLeftButtonUp += new MouseButtonEventHandler(MenuableUserControl_MouseLeftButtonUp);
+            MouseRightButtonDown += new MouseButtonEventHandler(MenuableUserControl_MouseRightButtonDown);
+
+            MouseRightButtonUp += new MouseButtonEventHandler(MenuableUserControl_MouseRightButtonUp);
         }
 
         void MenuableUserControl_MouseLeave(object sender, MouseEventArgs e)
@@ -34,15 +34,18 @@
        
         }
 
-        void MenuableUserControl_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
+        void MenuableUserControl_MouseRightButtonUp(object sender, MouseButtonEventArgs e)
         {
-            ((MenuableViewModel)base.DataContext).MenuableUserControl_MouseLeftButtonUp(sender, e);
+            ((MenuableViewModel)base.DataContext).DisactiveContextualMenu(sender, e);
         }
 
-        void MenuableUserControl_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+        void MenuableUserControl_MouseRightButtonDown(object sender, MouseButtonEventArgs e)
         {
-            if(this.IsEnabled)
-            ((MenuableViewModel)base.DataContext).MenuableUserControl_MouseLeftButtonDown(sender,e);
+            if (this.IsEnabled)
+            {
+                e.Handled = true;
+                ((MenuableViewModel)base.DataContext).ActiveContextualMenu(sender, e);
+            }
         }