diff --git a/.gitattributes b/.gitattributes
index b4b1c832042ba..b09c535e44a6b 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,2 @@
-# Patch 2017-12-06: Make build tools working on Windows 10
+# Patch 2017-12-06: Make sure line endings are right on Windows 10
 *.sh text eol=lf
diff --git a/make-chromium.bat b/make-chromium.bat
index 56daad9d99383..34d9959b6bfc1 100644
--- a/make-chromium.bat
+++ b/make-chromium.bat
@@ -1,6 +1,6 @@
 @ECHO OFF
 
-REM Patch 2017-12-06: Make build tools working on Windows 10
+REM Patch 2017-12-06: Build tool shim for Windows 10
 REM Need to install Python: sudo apt update && sudo apt install python -y
 
 BASH ./tools/make-chromium.sh
diff --git a/platform/chromium/options_ui.js b/platform/chromium/options_ui.js
index 1e7f552b12bd9..532696ff57aeb 100644
--- a/platform/chromium/options_ui.js
+++ b/platform/chromium/options_ui.js
@@ -27,18 +27,8 @@
 
 'use strict';
 
-vAPI.messaging.send(
-    'default',
-    {
-        what: 'gotoURL',
-        details: {
-            url: 'dashboard.html',
-            select: true,
-            index: -1
-        }
-    }
-);
-window.close();
+// Patch 2017-12-06: Do not open a new tab for the dashboard
+vAPI.openHere('dashboard.html');
 
 /******************************************************************************/
 
diff --git a/platform/chromium/vapi-client.js b/platform/chromium/vapi-client.js
index 0dfbd0dacf9ab..3749412bc4718 100644
--- a/platform/chromium/vapi-client.js
+++ b/platform/chromium/vapi-client.js
@@ -433,6 +433,15 @@ vAPI.messaging.Connection.prototype = {
 
 /******************************************************************************/
 
+// Patch 2017-12-06: Replace the current tab
+vAPI.openHere = function(path) {
+    if (chrome.tabs !== undefined) {
+        chrome.tabs.update({ url: path });
+    }
+};
+
+/******************************************************************************/
+
 vAPI.shutdown.add(function() {
     vAPI.messaging.shutdown();
     window.vAPI = undefined;