diff --git a/www/pad/comment.js b/www/pad/comment.js
index ccab47a74..9d91a5a72 100644
--- a/www/pad/comment.js
+++ b/www/pad/comment.js
@@ -24,7 +24,6 @@
         },
         init: function (editor) {
             var Messages = CKEDITOR._commentsTranslations;
-            var pluginName = 'comment';
 
             var styleDef = {
                 element: 'comment',
diff --git a/www/pad/inner.js b/www/pad/inner.js
index a8fc98924..c52e51264 100644
--- a/www/pad/inner.js
+++ b/www/pad/inner.js
@@ -511,54 +511,6 @@ define([
             $container: $('#cp-app-pad-comments')
         });
 
-        var onLinkClicked = function (e) {
-            var $target = $(e.target);
-            if (!$target.is('a')) { return; }
-            var href = $target.attr('href');
-            if (!href || href[0] === '#') { return; }
-            e.preventDefault();
-            e.stopPropagation();
-
-            var rect = e.target.getBoundingClientRect();
-            var rect0 = inner.getBoundingClientRect();
-            var l = (rect.left - rect0.left)+'px';
-            var t = rect.bottom + $iframe.scrollTop() +'px';
-
-            var a = h('a', { href: href}, href);
-            var link = h('div.cp-link-clicked.non-realtime', {
-                contenteditable: false,
-                style: 'top:'+t+';left:'+l
-            }, [ a ]);
-            var $link = $(link);
-            $inner.append(link);
-
-            if (rect.left + $link.outerWidth() - rect0.left > $inner.width()) {
-                $link.css('left', 'unset');
-                $link.css('right', 0);
-            }
-
-            $(a).click(function (ee) {
-                ee.preventDefault();
-                ee.stopPropagation();
-                framework._.sfCommon.openUnsafeURL(href);
-                $link.remove();
-            });
-            $link.on('mouseleave', function () {
-                $link.remove();
-            });
-        };
-        var removeClickedLink = function () {
-            $inner.find('.cp-link-clicked').remove();
-        };
-
-        $inner.click(function (e) {
-            if (e.target.nodeName.toUpperCase() === 'A') {
-                removeClickedLink();
-                return void onLinkClicked(e);
-            }
-            removeClickedLink();
-        });
-
         // My cursor
         var cursor = module.cursor = Cursor(inner);
 
@@ -1023,7 +975,7 @@ define([
                 editor.plugins.mediatag.import = function ($mt) {
                     framework._.sfCommon.importMediaTag($mt);
                 };
-                Links.addSupportForOpeningLinksInNewTab(Ckeditor)({editor: editor});
+                Links.init(Ckeditor, editor);
             }).nThen(function () {
                 // Move ckeditor parts to have a structure like the other apps
                 var $contentContainer = $('#cke_1_contents');
diff --git a/www/pad/links.js b/www/pad/links.js
index bc582f959..15fc4df66 100644
--- a/www/pad/links.js
+++ b/www/pad/links.js
@@ -1,14 +1,75 @@
-define(['/customize/messages.js'], function (Messages) {
-    // Adds a context menu entry to open the selected link in a new tab.
-    // See https://github.com/xwiki-contrib/application-ckeditor/commit/755d193497bf23ed874d874b4ae92fbee887fc10
+define([
+    'jquery',
+    '/common/hyperscript.js',
+    '/customize/messages.js'
+], function ($, h, Messages) {
+
+    var onLinkClicked = function (e, inner) {
+        var $target = $(e.target);
+        if (!$target.is('a')) { return; }
+        var href = $target.attr('href');
+        if (!href || href[0] === '#') { return; }
+        e.preventDefault();
+        e.stopPropagation();
+
+        var $iframe = $('html').find('iframe').contents();
+        var $inner = $(inner);
+
+        var rect = e.target.getBoundingClientRect();
+        var rect0 = inner.getBoundingClientRect();
+        var l = (rect.left - rect0.left)+'px';
+        var t = rect.bottom + $iframe.scrollTop() +'px';
+
+        var a = h('a', { href: href}, href);
+        var link = h('div.cp-link-clicked.non-realtime', {
+            contenteditable: false,
+            style: 'top:'+t+';left:'+l
+        }, [ a ]);
+        var $link = $(link);
+        $inner.append(link);
+
+        if (rect.left + $link.outerWidth() - rect0.left > $inner.width()) {
+            $link.css('left', 'unset');
+            $link.css('right', 0);
+        }
+
+        $(a).click(function (ee) {
+            ee.preventDefault();
+            ee.stopPropagation();
+            var bounceHref = window.location.origin + '/bounce/#' + encodeURIComponent(href);
+            window.open(bounceHref);
+            $link.remove();
+        });
+        $link.on('mouseleave', function () {
+            $link.remove();
+        });
+    };
+    var removeClickedLink = function ($inner) {
+        $inner.find('.cp-link-clicked').remove();
+    };
+
     return {
-        addSupportForOpeningLinksInNewTab : function (Ckeditor) {
-                // Returns the DOM element of the active (currently focused) link. It has also support for linked image widgets.
-            // @return {CKEDITOR.dom.element}
-            var getActiveLink = function(editor) {
-                var anchor = Ckeditor.plugins.link.getSelectedLink(editor),
-                    // We need to do some special checking against widgets availability.
-                    activeWidget = editor.widgets && editor.widgets.focused;
+        init : function (Ckeditor, editor) {
+            if (!Ckeditor.plugins.link) { return; }
+
+            var inner = editor.document.$.body;
+            var $inner = $(inner);
+            console.log($inner, inner);
+            // Bubble to open the link in a new tab
+            $inner.click(function (e) {
+                removeClickedLink($inner);
+                if (e.target.nodeName.toUpperCase() === 'A') {
+                    return void onLinkClicked(e, inner);
+                }
+            });
+
+
+
+            // Adds a context menu entry to open the selected link in a new tab.
+            var getActiveLink = function() {
+                var anchor = Ckeditor.plugins.link.getSelectedLink(editor);
+                // We need to do some special checking against widgets availability.
+                var activeWidget = editor.widgets && editor.widgets.focused;
                 // If default way of getting links didn't return anything useful..
                 if (!anchor && activeWidget && activeWidget.name === 'image' && activeWidget.parts.link) {
                     // Since CKEditor 4.4.0 image widgets may be linked.
@@ -17,44 +78,38 @@ define(['/customize/messages.js'], function (Messages) {
                 return anchor;
             };
 
-            return function(event) {
-                var editor = event.editor;
-                if (!Ckeditor.plugins.link) {
-                    return;
-                }
-                editor.addCommand( 'openLink', {
-                    exec: function(editor) {
-                        var anchor = getActiveLink(editor);
-                        if (anchor) {
-                            var href = anchor.getAttribute('href');
-                            if (href) {
-                                var bounceHref = window.location.origin + '/bounce/#' + encodeURIComponent(href);
-                                window.open(bounceHref);
-                            }
+            editor.addCommand( 'openLink', {
+                exec: function() {
+                    var anchor = getActiveLink();
+                    if (anchor) {
+                        var href = anchor.getAttribute('href');
+                        if (href) {
+                            var bounceHref = window.location.origin + '/bounce/#' + encodeURIComponent(href);
+                            window.open(bounceHref);
                         }
                     }
-                });
-                if (typeof editor.addMenuItem === 'function') {
-                    editor.addMenuItem('openLink', {
-                        label: Messages.openLinkInNewTab,
-                        command: 'openLink',
-                        group: 'link',
-                        order: -1
-                    });
                 }
-                if (editor.contextMenu) {
-                    editor.contextMenu.addListener(function(startElement) {
-                        if (startElement) {
-                            var anchor = getActiveLink(editor);
-                            if (anchor && anchor.getAttribute('href')) {
-                                return {openLink: Ckeditor.TRISTATE_OFF};
-                            }
+            });
+            if (typeof editor.addMenuItem === 'function') {
+                editor.addMenuItem('openLink', {
+                    label: Messages.openLinkInNewTab,
+                    command: 'openLink',
+                    group: 'link',
+                    order: -1
+                });
+            }
+            if (editor.contextMenu) {
+                editor.contextMenu.addListener(function(startElement) {
+                    if (startElement) {
+                        var anchor = getActiveLink();
+                        if (anchor && anchor.getAttribute('href')) {
+                            return {openLink: Ckeditor.TRISTATE_OFF};
                         }
-                    });
-                    editor.contextMenu._.panelDefinition.css.push('.cke_button__openLink_icon {' +
-                        Ckeditor.skin.getIconStyle('link') + '}');
-                }
-            };
+                    }
+                });
+                editor.contextMenu._.panelDefinition.css.push('.cke_button__openLink_icon {' +
+                    Ckeditor.skin.getIconStyle('link') + '}');
+            }
         }
     };
 });