diff --git a/scripts/vr-edit/modules/toolMenu.js b/scripts/vr-edit/modules/toolMenu.js
index c0b418cd1e..c9195155af 100644
--- a/scripts/vr-edit/modules/toolMenu.js
+++ b/scripts/vr-edit/modules/toolMenu.js
@@ -336,7 +336,7 @@ ToolMenu = function (side, leftInputs, rightInputs, uiCommandCallback) {
                     },
                     label: "FINISH",
                     command: {
-                        method: "closeOptions"
+                        method: "clearTool"
                     }
                 }
             ],
@@ -358,7 +358,7 @@ ToolMenu = function (side, leftInputs, rightInputs, uiCommandCallback) {
                     },
                     label: "FINISH",
                     command: {
-                        method: "closeOptions"
+                        method: "clearTool"
                     }
                 }
             ],
@@ -813,7 +813,7 @@ ToolMenu = function (side, leftInputs, rightInputs, uiCommandCallback) {
                     },
                     label: "FINISH",
                     command: {
-                        method: "closeOptions"
+                        method: "clearTool"
                     }
                 }
             ]
@@ -1619,6 +1619,10 @@ ToolMenu = function (side, leftInputs, rightInputs, uiCommandCallback) {
             closeOptions();
             break;
 
+        case "clearTool":
+            uiCommandCallback("clearTool");
+            break;
+
         default:
             App.log(side, "ERROR: ToolMenu: Unexpected command! " + command);
         }
diff --git a/scripts/vr-edit/vr-edit.js b/scripts/vr-edit/vr-edit.js
index e278ff12a9..3bac2fcd90 100644
--- a/scripts/vr-edit/vr-edit.js
+++ b/scripts/vr-edit/vr-edit.js
@@ -846,6 +846,7 @@
                 toolSelected = TOOL_NONE;
                 grouping.clear();
                 ui.clearTool();
+                ui.updateUIEntities();
             }
         }
 
@@ -1378,6 +1379,10 @@
             ui.setToolIcon(ui.DELETE_TOOL);
             ui.updateUIEntities();
             break;
+        case "clearTool":
+            ui.clearTool();
+            ui.updateUIEntities();
+            break;
 
         case "groupButton":
             grouping.group();