diff --git a/www/common/toolbar2.js b/www/common/toolbar2.js
index 519700624..f641c0c9f 100644
--- a/www/common/toolbar2.js
+++ b/www/common/toolbar2.js
@@ -624,7 +624,7 @@ define([
         }).appendTo(toolbar.$top);
 
         // We need to override the "a" tag action here because it is inside the iframe!
-        var inDrive = /^\/drive/;
+        var inDrive = /^\/drive/.test(window.location.pathname);
 
         var href = inDrive ? '/index.html' : '/drive/';
         var buttonTitle = inDrive ? Messages.header_homeTitle : Messages.header_logoTitle;