diff --git a/javascript/context_menu.js b/javascript/context_menu.js
index 2a37f09..d327496 100644
--- a/javascript/context_menu.js
+++ b/javascript/context_menu.js
@@ -1,15 +1,15 @@
 /* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 (function(){
 
-	var edit_msg = {};
+    var edit_msg = {};
 
-	function menuClicked(info, tab) {
-		if (edit_msg) {
-			var tab_port = chrome.tabs.connect(tab.id);
-			tab_port.sender = { tab: tab };
-			handleContentMessages(edit_msg, tab_port);
-		}
-	}
+    function menuClicked(info, tab) {
+        if (edit_msg) {
+            var tab_port = chrome.tabs.connect(tab.id);
+            edit_msg.pageUrl = info.pageUrl;
+            handleContentMessages(edit_msg, tab_port);
+        }
+    }
 
 
 	var menu_enabled = false;
diff --git a/javascript/xmlcomms.js b/javascript/xmlcomms.js
index 9ebb3a8..0f60457 100644
--- a/javascript/xmlcomms.js
+++ b/javascript/xmlcomms.js
@@ -93,10 +93,8 @@ function handleContentMessages(msg, tab_port)
     var id = msg.id;
     var text = msg.text;
     var file = msg.file;
-
-    var page_url = tab_port.sender.tab.url;
-    var page_port = tab_port.portId_;
-    console.log(" from page:"+page_url+" and tab port:"+page_port);
+    var page_url = msg.pageUrl;
+    console.log(" from page:"+page_url);
 
     var xhr = new XMLHttpRequest();
     var url = getEditUrl() + cmd;