diff --git a/index.php b/index.php
index cc807d0..991e175 100644
--- a/index.php
+++ b/index.php
@@ -1545,7 +1545,7 @@ function renderPage()
         pubsubhub();
 
         // If we are called from the bookmarklet, we must close the popup:
-        if (isset($_GET['source']) && $_GET['source']=='bookmarklet') { echo '<script language="JavaScript">self.close();</script>'; exit; }
+        if (isset($_GET['source']) && ($_GET['source']=='bookmarklet' || $_GET['source']=='firefoxsocialapi')) { echo '<script language="JavaScript">self.close();</script>'; exit; }
         $returnurl = ( isset($_POST['returnurl']) ? $_POST['returnurl'] : '?' );
         $returnurl .= '#'.smallHash($linkdate);  // Scroll to the link which has been edited.
         if (strstr($returnurl, "do=addlink")) { $returnurl = '?'; } //if we come from ?do=addlink, set returnurl to homepage instead
@@ -1557,7 +1557,7 @@ function renderPage()
     if (isset($_POST['cancel_edit']))
     {
         // If we are called from the bookmarklet, we must close the popup;
-        if (isset($_GET['source']) && $_GET['source']=='bookmarklet') { echo '<script language="JavaScript">self.close();</script>'; exit; }
+        if (isset($_GET['source']) && ($_GET['source']=='bookmarklet' || $_GET['source']=='firefoxsocialapi')) { echo '<script language="JavaScript">self.close();</script>'; exit; }
         $returnurl = ( isset($_POST['returnurl']) ? $_POST['returnurl'] : '?' );
         $returnurl .= '#'.smallHash($_POST['lf_linkdate']);  // Scroll to the link which has been edited.
         header('Location: '.$returnurl); // After canceling, redirect to the page the user was on.
@@ -1659,6 +1659,7 @@ function renderPage()
         $PAGE->assign('link_is_new',$link_is_new);
         $PAGE->assign('token',getToken()); // XSRF protection.
         $PAGE->assign('http_referer',(isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : ''));
+        $PAGE->assign('source',(isset($_GET['source']) ? $_GET['source'] : ''));
         $PAGE->renderPage('editlink');
         exit;
     }
diff --git a/tpl/editlink.html b/tpl/editlink.html
index 2800bc9..3306b8a 100644
--- a/tpl/editlink.html
+++ b/tpl/editlink.html
@@ -12,7 +12,9 @@
   {elseif condition="$link.description==''"}onload="document.linkform.lf_description.focus();"
   {else}onload="document.linkform.lf_tags.focus();"{/if} >
     <div id="pageheader">
-      {include="page.header"}
+      {if="$source !== 'firefoxsocialapi'"}
+        {include="page.header"}
+      {/if}
       <div id="editlinkform">
         <form method="post" name="linkform">
           <p>
@@ -61,7 +63,9 @@
         </form>
       </div>
     </div>
-    {include="page.footer"}
+    {if="$source !== 'firefoxsocialapi'"}
+      {include="page.footer"}
+    {/if}
     {if="($GLOBALS['config']['OPEN_SHAARLI'] || isLoggedIn()) && empty($GLOBALS['disablejquery'])"}
     <script language="JavaScript">
       $(document).ready(function() {
diff --git a/tpl/tools.html b/tpl/tools.html
index 439f410..c57d32e 100644
--- a/tpl/tools.html
+++ b/tpl/tools.html
@@ -12,9 +12,35 @@
     <a href="?do=export"><b>Export</b> <span>:  Export Netscape html bookmarks (which can be imported in Firefox, Chrome, Opera, delicious...)</span></a><br><br>
     <a class="smallbutton" onclick="alert('Drag this link to your bookmarks toolbar, or right-click it and choose Bookmark This Link...');return false;" href="javascript:javascript:(function(){var%20url%20=%20location.href;var%20title%20=%20document.title%20||%20url;window.open('{$pageabsaddr}?post='%20+%20encodeURIComponent(url)+'&amp;title='%20+%20encodeURIComponent(title)+'&amp;description='%20+%20encodeURIComponent(document.getSelection())+'&amp;source=bookmarklet','_blank','menubar=no,height=390,width=600,toolbar=no,scrollbars=no,status=no,dialog=1');})();"><b>✚Shaare link</b></a> <a href="#" style="clear:none;"><span>&#x21D0; Drag this link to your bookmarks toolbar (or right-click it and choose Bookmark This Link....).<br>&nbsp;&nbsp;&nbsp;&nbsp;Then click "✚Shaare link" button in any page you want to share.</span></a><br><br>
     <a class="smallbutton" onclick="alert('Drag this link to your bookmarks toolbar, or right-click it and choose Bookmark This Link...');return false;" href="?private=1&post="><b>✚Add Note</b></a> <a href="#" style="clear:none;"><span>&#x21D0; Drag this link to your bookmarks toolbar (or right-click it and choose Bookmark This Link....).<br>&nbsp;&nbsp;&nbsp;&nbsp;Then click "✚Add Note" button anytime to start composing a (default private)  Note (text post) to your Shaarli.</span></a><br><br>
+    <a class="smallbutton" onclick="activateFirefoxSocial(this)"><b>✚Add to Firefox social</b></a> <a href="#" style="clear:none;"><span>&#x21D0; Click on this button to add Shaarli to the "Share this page" button in Firefox.</span></a><br><br>
     <div class="clear"></div>
   </div>
 </div>
 {include="page.footer"}
+    <script>
+      function activateFirefoxSocial(node) {
+        var loc = location.href;
+        var baseURL = loc.substring(0, loc.lastIndexOf("/"));
+
+        // Keeping the data separated (ie. not in the DOM) so that it's maintainable and diffable.
+        var data = {
+          name: "{$shaarlititle}",
+          description: "The personal, minimalist, super-fast, no-database delicious clone.",
+          author: "Shaarli",
+          version: "1.0.0",
+
+          iconURL: baseURL + "/images/favicon.ico",
+          icon32URL: baseURL + "/images/favicon.ico",
+          icon64URL: baseURL + "/images/favicon.ico",
+
+          shareURL: baseURL + "{noparse}?post=%{url}&title=%{title}&description=%{description}&source=firefoxsocialapi{/noparse}",
+          homepageURL: baseURL
+        };
+        node.setAttribute("data-service", JSON.stringify(data));
+
+        var activate = new CustomEvent("ActivateSocialFeature");
+        node.dispatchEvent(activate);
+      }
+    </script>
 </body>
 </html>
\ No newline at end of file