diff --git a/examples/newEditEntities.js b/examples/newEditEntities.js
index 0b8eebfee5..cc3c0fceda 100644
--- a/examples/newEditEntities.js
+++ b/examples/newEditEntities.js
@@ -55,13 +55,11 @@ var wantEntityGlow = false;
 var SPAWN_DISTANCE = 1;
 var DEFAULT_DIMENSION = 0.20;
 
-var MENU_GRID_TOOL_ENABLED = 'Grid Tool';
 var MENU_INSPECT_TOOL_ENABLED = "Inspect Tool";
 var MENU_EASE_ON_FOCUS = "Ease Orientation on Focus";
 
 var SETTING_INSPECT_TOOL_ENABLED = "inspectToolEnabled";
 var SETTING_EASE_ON_FOCUS = "cameraEaseOnFocus";
-var SETTING_GRID_TOOL_ENABLED = 'GridToolEnabled';
 
 var modelURLs = [
         HIFI_PUBLIC_BUCKET + "models/entities/2-Terrain:%20Alder.fbx",
@@ -273,12 +271,14 @@ var toolBar = (function () {
             if (!isActive) {
                 gridTool.setVisible(false);
                 grid.setEnabled(false);
+                propertiesTool.setVisible(false);
                 selectionManager.clearSelections();
                 cameraManager.disable();
             } else {
                 cameraManager.enable();
-                gridTool.setVisible(Menu.isOptionChecked(MENU_GRID_TOOL_ENABLED));
+                gridTool.setVisible(true);
                 grid.setEnabled(true);
+                propertiesTool.setVisible(true);
             }
             return true;
         }
@@ -610,10 +610,6 @@ function setupModelMenus() {
     Menu.addMenuItem({ menuName: "File", menuItemName: "Import Models", shortcutKey: "CTRL+META+I", afterItem: "Export Models" });
     Menu.addMenuItem({ menuName: "Developer", menuItemName: "Debug Ryans Rotation Problems", isCheckable: true });
 
-    Menu.addMenuItem({ menuName: "View", menuItemName: MENU_GRID_TOOL_ENABLED, afterItem: "Edit Entities Help...", isCheckable: true,
-                       isChecked: Settings.getValue(SETTING_GRID_TOOL_ENABLED) == 'true'});
-    Menu.addMenuItem({ menuName: "View", menuItemName: MENU_INSPECT_TOOL_ENABLED, afterItem: MENU_GRID_TOOL_ENABLED,
-                       isCheckable: true, isChecked: Settings.getValue(SETTING_INSPECT_TOOL_ENABLED) == "true" });
     Menu.addMenuItem({ menuName: "View", menuItemName: MENU_EASE_ON_FOCUS, afterItem: MENU_INSPECT_TOOL_ENABLED,
                        isCheckable: true, isChecked: Settings.getValue(SETTING_EASE_ON_FOCUS) == "true" });
 }
@@ -638,8 +634,6 @@ function cleanupModelMenus() {
     Menu.removeMenuItem("File", "Import Models");
     Menu.removeMenuItem("Developer", "Debug Ryans Rotation Problems");
 
-    Settings.setValue(SETTING_GRID_TOOL_ENABLED, Menu.isOptionChecked(MENU_GRID_TOOL_ENABLED));
-    Menu.removeMenuItem("View", MENU_GRID_TOOL_ENABLED);
     Menu.removeMenuItem("View", MENU_INSPECT_TOOL_ENABLED);
     Menu.removeMenuItem("View", MENU_EASE_ON_FOCUS);
 }
@@ -751,10 +745,6 @@ function handeMenuEvent(menuItem) {
         }
     } else if (menuItem == "Import Models") {
         modelImporter.doImport();
-    } else if (menuItem == MENU_GRID_TOOL_ENABLED) {
-        if (isActive) {
-            gridTool.setVisible(Menu.isOptionChecked(MENU_GRID_TOOL_ENABLED));
-        }
     }
     tooltip.show(false);
 }
@@ -920,7 +910,14 @@ PropertiesTool = function(opts) {
     var url = Script.resolvePath('html/entityProperties.html');
     var webView = new WebWindow('Entity Properties', url, 200, 280);
 
-    webView.setVisible(true);
+    var visible = false;
+
+    webView.setVisible(visible);
+
+    that.setVisible = function(newVisible) {
+        visible = newVisible;
+        webView.setVisible(visible);
+    };
 
     selectionManager.addEventListener(function() {
         data = {
diff --git a/interface/src/scripting/WebWindowClass.cpp b/interface/src/scripting/WebWindowClass.cpp
index 1645fe2f56..7f11dbe580 100644
--- a/interface/src/scripting/WebWindowClass.cpp
+++ b/interface/src/scripting/WebWindowClass.cpp
@@ -39,22 +39,23 @@ WebWindowClass::WebWindowClass(const QString& title, const QString& url, int wid
 
     QMainWindow* toolWindow = Application::getInstance()->getToolWindow();
 
-    _window = new QDockWidget(title, toolWindow);
-    QWebView* webView = new QWebView(_window);
+    _dockWidget = new QDockWidget(title, toolWindow);
+    _dockWidget->setFeatures(QDockWidget::DockWidgetMovable);
+    QWebView* webView = new QWebView(_dockWidget);
     webView->page()->mainFrame()->addToJavaScriptWindowObject("EventBridge", _eventBridge);
     webView->setUrl(url);
-    _window->setWidget(webView);
+    _dockWidget->setWidget(webView);
 
-    toolWindow->addDockWidget(Qt::RightDockWidgetArea, _window);
+    toolWindow->addDockWidget(Qt::RightDockWidgetArea, _dockWidget);
 
-    connect(this, &WebWindowClass::destroyed, _window, &QWidget::deleteLater);
+    connect(this, &WebWindowClass::destroyed, _dockWidget, &QWidget::deleteLater);
 }
 
 WebWindowClass::~WebWindowClass() {
 }
 
 void WebWindowClass::setVisible(bool visible) {
-    QMetaObject::invokeMethod(_window, "setVisible", Qt::BlockingQueuedConnection, Q_ARG(bool, visible));
+    QMetaObject::invokeMethod(_dockWidget, "setVisible", Qt::BlockingQueuedConnection, Q_ARG(bool, visible));
 }
 
 QScriptValue WebWindowClass::constructor(QScriptContext* context, QScriptEngine* engine) {
diff --git a/interface/src/scripting/WebWindowClass.h b/interface/src/scripting/WebWindowClass.h
index c37b7aea48..ae0d14ae06 100644
--- a/interface/src/scripting/WebWindowClass.h
+++ b/interface/src/scripting/WebWindowClass.h
@@ -44,7 +44,7 @@ public slots:
     ScriptEventBridge* getEventBridge() const { return _eventBridge; }
 
 private:
-    QDockWidget* _window;
+    QDockWidget* _dockWidget;
     ScriptEventBridge* _eventBridge;
 };