Index: src/DeltaShell/DeltaShell.Plugins.SharpMapGis.Gui/Commands/MapMeasureCommand.cs
===================================================================
diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -r5fc71a385897af92ccb092f2f969b5709afab85a
--- src/DeltaShell/DeltaShell.Plugins.SharpMapGis.Gui/Commands/MapMeasureCommand.cs	(.../MapMeasureCommand.cs)	(revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9)
+++ src/DeltaShell/DeltaShell.Plugins.SharpMapGis.Gui/Commands/MapMeasureCommand.cs	(.../MapMeasureCommand.cs)	(revision 5fc71a385897af92ccb092f2f969b5709afab85a)
@@ -4,6 +4,18 @@
 {
     public class MapMeasureCommand : MapViewCommand
     {
+        protected override IMapTool CurrentTool
+        {
+            get
+            {
+                if (MapView == null)
+                {
+                    return null;
+                }
+                return MapView.MapControl.GetToolByType<MeasureTool>();
+            }
+        }
+
         protected override void OnExecute(object[] arguments)
         {
             var tool = CurrentTool;
@@ -18,19 +30,9 @@
                 {
                     MapView.MapControl.ActivateTool(tool);
                 }
-
             }
 
             base.OnExecute(arguments);
         }
-
-        protected override IMapTool CurrentTool
-        {
-            get
-            {
-                if (MapView == null) return null;
-                return MapView.MapControl.GetToolByType<MeasureTool>(); 
-            }
-        }
     }
 }
\ No newline at end of file