diff --git a/platform/safari/Info.plist b/platform/safari/Info.plist
index 0e05e50b5..b12663242 100644
--- a/platform/safari/Info.plist
+++ b/platform/safari/Info.plist
@@ -21,7 +21,7 @@
         <key>Database Quota</key>
         <real>52428800</real>
         <key>Global Page</key>
-        <string>background.html#{appInfo}</string>
+        <string>background.html</string>
         <key>Popovers</key>
         <array>
             <dict>
@@ -40,8 +40,12 @@
                 <string>img/browsericons/icon16.png</string>
                 <key>Label</key>
                 <string>{name}</string>
+                <key>Palette Label</key>
+                <string>{name}</string>
                 <key>Popover</key>
                 <string>popover</string>
+                <key>Tool Tip</key>
+                <string>{name} {version}</string>
             </dict>
         </array>
     </dict>
diff --git a/platform/safari/vapi-background.js b/platform/safari/vapi-background.js
index 887e27520..f027bd5dc 100644
--- a/platform/safari/vapi-background.js
+++ b/platform/safari/vapi-background.js
@@ -36,9 +36,9 @@ vAPI.safari = true;
 
 /******************************************************************************/
 
-vAPI.app = location.hash.slice(1).split(',');
+vAPI.app = safari.extension.toolbarItems[0].toolTip.split(' ');
 vAPI.app = {
-    name: decodeURIComponent(vAPI.app[0]),
+    name: vAPI.app[0],
     version: vAPI.app[1]
 };
 
diff --git a/platform/safari/vapi-common.js b/platform/safari/vapi-common.js
index f324fd6ad..820a168ca 100644
--- a/platform/safari/vapi-common.js
+++ b/platform/safari/vapi-common.js
@@ -104,6 +104,8 @@ vAPI.i18n = function(s) {
     return this.i18nData[s] || '';
 };
 
+/******************************************************************************/
+
 })();
 
 /******************************************************************************/