Index: src/app/qgsmeasuretool.cpp
===================================================================
--- src/app/qgsmeasuretool.cpp	(revision 15829)
+++ src/app/qgsmeasuretool.cpp	(working copy)
@@ -63,10 +63,13 @@
 {
   mDialog->restorePosition();
   QgsMapTool::activate();
-  mRightMouseClicked = false;
-
+  
+  // Reset tool if user had rightclicked before tool switching
+  if ( mRightMouseClicked )
+    mDialog->restart();
   // ensure that we have correct settings
-  updateSettings();
+  else
+    updateSettings();
 
   // If we suspect that they have data that is projected, yet the
   // map CRS is set to a geographic one, warn them.