diff --git a/background.js b/background.js
index 4f9dec2..9e00242 100644
--- a/background.js
+++ b/background.js
@@ -2,28 +2,18 @@ function onError(error) {
   console.log(`Error: ${error}`);
 }
 
-function onGot(item) {
-	instance = item["instance_url"];
-	windowWidth = item["window_width"];
-	windowHeight = item["window_height"];
-	noQueryStrings = item["remove_querystrings"];
-}
-
-function shareURL(donnees){
-	browser.tabs.query({active: true},function(tabs){
+function shareURL(selectionContent,currentTab){
 
 		browser.storage.local.get(["instance_url","window_width","window_height","remove_querystrings"],function(item){
 
-		let instance = item["instance_url"];
-		let windowWidth = item["window_width"];
-		let windowHeight = item["window_height"];
-		let noQueryStrings = item["remove_querystrings"];
-
-		let tab = tabs[0];
+		instance = item["instance_url"];
+		windowWidth = item["window_width"];
+		windowHeight = item["window_height"];
+		noQueryStrings = item["remove_querystrings"];
 
 		// manages Mozilla Firefox reader mode
-		let rawUrl = tab.url;
-		let partToRemove = "about:reader?url=";
+		var rawUrl = currentTab.url;
+		var partToRemove = "about:reader?url=";
 		if(rawUrl.includes(partToRemove)) {
 		rawUrl = rawUrl.substring(partToRemove.length);
 		rawUrl = decodeURIComponent(rawUrl);
@@ -34,7 +24,7 @@ function shareURL(donnees){
 			rawUrl = rawUrl.split("?")[0];
 		}
 
-		let url = instance + "/bookmarks.php?action=add&address=" + encodeURIComponent(rawUrl) + "&title=" + encodeURIComponent(tabs[0].title) + "&description=" + encodeURIComponent(donnees);
+		var url = instance + "/bookmarks.php?action=add&address=" + encodeURIComponent(rawUrl) + "&title=" + encodeURIComponent(currentTab.title) + "&description=" + encodeURIComponent(selectionContent);
 		widthInt = Number(windowWidth);
 		heightInt = Number(windowHeight);
 
@@ -57,20 +47,24 @@ function shareURL(donnees){
 			});
 		});
 	});
-});
 }
 
 browser.contextMenus.create({
 	id: "semantic-scuttle",
 	title: "Add to (Semantic)Scuttle",
 	onclick: function(){
-		shareURL();
+    browser.tabs.query({ currentWindow: true, active: true }, function(tabs) {
+      tab = tabs[0];
+    browser.tabs.sendMessage(tab.id, {method: "getSelection"}).then(response => {
+  	shareURL(response.response,tab);
+    }).catch(onError);
+  });
 	},
 	contexts: ["all"]
 });
 
 browser.browserAction.onClicked.addListener((tab) => {
 	browser.tabs.sendMessage(tab.id, {method: "getSelection"}).then(response => {
-	shareURL(response.response);
+	shareURL(response.response,tab);
   }).catch(onError);
 });
diff --git a/manifest.json b/manifest.json
index f982408..f9eeead 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"manifest_version" : 2,
 	"name": "Add to (Semantic)Scuttle",
-	"version" : "0.7",
+	"version" : "0.7.1",
 	"description" : "Add bookmarks to a (Semantic)Scuttle instance, a social bookmarking tool experimenting with tags and collaborative tag descriptions.",
 	"homepage_url" : "https://addons.mozilla.org/fr/firefox/addon/add-to-semantic-scuttle/",
 	"icons" : {