diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js
index 047a5b17557..fa8dc60c251 100644
--- a/addons/website/static/src/js/website.editor.js
+++ b/addons/website/static/src/js/website.editor.js
@@ -3,7 +3,53 @@
 
     var website = openerp.website;
 
+    website.templates.push('/website/static/src/xml/website.editor.xml');
+    website.dom_ready.done(function () {
+        // $.fn.data automatically parses value, '0'|'1' -> 0|1
+        website.is_editable = $(document.documentElement).data('editable');
+        var is_smartphone = $(document.body)[0].clientWidth < 767;
+
+        if (website.is_editable && !is_smartphone) {
+            website.ready().then(website.init_editor);
+        }
+    });
+
+    function link_dialog(editor) {
+        return new website.editor.LinkDialog(editor).appendTo(document.body);
+    }
+
     website.init_editor = function () {
+        CKEDITOR.plugins.add('customdialogs', {
+            requires: 'link,image',
+            init: function (editor) {
+                editor.on('doubleclick', function (evt) {
+                    if (evt.data.dialog === 'link' || evt.data.dialog === 'image') {
+                        delete evt.data.dialog;
+                        link_dialog(editor);
+                    }
+                    // priority should be smaller than dialog (999) but bigger
+                    // than link or image (default=10)
+                }, null, null, 500);
+
+                editor.addCommand('link', {
+                    exec: function (editor, data) {
+                        link_dialog(editor);
+                        return true;
+                    },
+                    canUndo: false,
+                    editorFocus: true,
+                });
+                editor.addCommand('image', {
+                    exec: function (editor, data) {
+                        console.log('image', editor, data);
+                        return true;
+                    },
+                    canUndo: false,
+                    editorFocus: true,
+                });
+
+            }
+        });
         var editor = new website.EditorBar();
         var $body = $(document.body);
         editor.prependTo($body);
@@ -215,7 +261,7 @@
                 autoParagraph: false,
                 filebrowserImageUploadUrl: "/website/attach",
                 // Support for sharedSpaces in 4.x
-                extraPlugins: 'sharedspace',
+                extraPlugins: 'sharedspace,customdialogs',
                 // Place toolbar in controlled location
                 sharedSpaces: { top: 'oe_rte_toolbar' },
                 toolbar: [
@@ -251,6 +297,158 @@
         },
     });
 
+    website.editor = { };
+    website.editor.Dialog = openerp.Widget.extend({
+        events: {
+            'hidden': 'destroy',
+        },
+        init: function (editor) {
+            this._super();
+            this.editor = editor;
+        },
+        start: function () {
+            var sup = this._super();
+            this.$el.modal();
+            return sup;
+        },
+    });
+
+    website.editor.LinkDialog = website.editor.Dialog.extend({
+        template: 'website.editor.dialog.link',
+        events: _.extend({}, website.editor.Dialog.prototype.events, {
+            'click button.btn-primary': 'save',
+            'change .url-source': function (e) { this.changed($(e.target)); },
+        }),
+        init: function (editor) {
+            this._super(editor);
+            this.pages = Object.create(null);
+        },
+        start: function () {
+            var element;
+            if ((element = this.get_selected_link()) && element.hasAttribute('href')) {
+                this.editor.getSelection().selectElement(element);
+            }
+            this.element = element;
+
+            return $.when(
+                this.fetch_pages().done(this.proxy('fill_pages')),
+                this._super()
+            ).done(this.proxy('bind_data'));
+        },
+        /**
+         * Greatly simplified version of CKEDITOR's
+         * plugins.link.dialogs.link.onOk.
+         *
+         * @param {String} url
+         * @param {Boolean} [new_window=false]
+         * @param {String} [label=null]
+         */
+        make_link: function (url, new_window, label) {
+            var attributes = {href: url, 'data-cke-saved-href': url};
+            var to_remove = [];
+            if (new_window) {
+                attributes['target'] = '_blank';
+            } else {
+                to_remove.push('target');
+            }
+
+            if (this.element) {
+                this.element.setAttributes(attributes);
+                this.element.removeAttributes(to_remove);
+            } else {
+                var selection = this.editor.getSelection();
+                var range = selection.getRanges(true)[0];
+
+                if (range.collapsed) {
+                    var text = new CKEDITOR.dom.text(label || url);
+                    range.insertNode(text);
+                    range.selectNodeContents(text);
+                }
+
+                new CKEDITOR.style({
+                    type: CKEDITOR.STYLE_INLINE,
+                    element: 'a',
+                    attributes: attributes,
+                }).applyToRange(range);
+                // blows up the call stack, not sure why as original version
+                // seems to work OK
+                // range.select();
+            }
+        },
+        save: function () {
+            var $e = this.$('.url-source').filter(function () { return !!this.value; });
+
+            var val = $e.val();
+            if ($e.hasClass('email-address')) {
+                this.make_link('mailto:' + val, false, val);
+            } else if ($e.hasClass('pages')) {
+                this.make_link(val, false, $e.find('option:selected').text());
+            } else {
+                this.make_link(val, this.$('input.window-new').prop('checked'));
+            }
+            this.$el.modal('hide');
+        },
+        bind_data: function () {
+            var href = this.element && (this.element.data( 'cke-saved-href')
+                                    ||  this.element.getAttribute('href'));
+            if (!href) { return; }
+
+            var match, $control;
+            if (match = /(mailto):(.+)/.exec(href)) {
+                $control = this.$('input.email-address').val(match[2]);
+            } else if(href in this.pages) {
+                $control = this.$('select.pages').val(href);
+            }
+            if (!$control) {
+                $control = this.$('input.url').val(href);
+            }
+
+            this.changed($control);
+
+            this.$('input.window-new').prop(
+                'checked', this.element.getAttribute('target') === '_blank');
+        },
+        changed: function ($e) {
+            $e.closest('li.list-group-item').addClass('active')
+              .siblings().removeClass('active');
+            this.$('.url-source').not($e).val('');
+        },
+        /**
+         * CKEDITOR.plugins.link.getSelectedLink ignores the editor's root,
+         * if the editor is set directly on a link it will thus not work.
+         */
+        get_selected_link: function () {
+            var sel = this.editor.getSelection(),
+                el = sel.getSelectedElement();
+            if (el && el.is('a')) { return el; }
+
+            var range = sel.getRanges(true)[0];
+            if (!range) { return null; }
+
+            range.shrink(CKEDITOR.SHRINK_TEXT);
+            return this.editor.elementPath(range.getCommonAncestor())
+                              .contains('a');
+
+        },
+        fetch_pages: function () {
+            return openerp.jsonRpc('/web/dataset/call_kw', 'call', {
+                model: 'website',
+                method: 'list_pages',
+                args: [],
+                kwargs: {}
+            });
+        },
+        fill_pages: function (results) {
+            var self = this;
+            var $select = this.$('select');
+            $select.append(new Option());
+            _(results).each(function (result) {
+                self.pages[result.url] = true;
+                $select.append(new Option(result.name, result.url));
+            });
+        },
+    });
+
 
     var Observer = window.MutationObserver || window.WebkitMutationObserver || window.JsMutationObserver;
     var observer = new Observer(function (mutations) {
@@ -279,14 +477,4 @@
             .uniq()
             .each(function (node) { $(node).trigger('content_changed'); })
     });
-
-    website.dom_ready.done(function () {
-        // $.fn.data automatically parses value, '0'|'1' -> 0|1
-        website.is_editable = $(document.documentElement).data('editable');
-        var is_smartphone = $(document.body)[0].clientWidth < 767;
-
-        if (website.is_editable && !is_smartphone) {
-            website.ready().then(website.init_editor);
-        }
-    });
 })();
diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js
index f55ebc34bf2..8a7f396895f 100644
--- a/addons/website/static/src/js/website.js
+++ b/addons/website/static/src/js/website.js
@@ -5,7 +5,7 @@
     // The following line can be removed in 2017
     openerp.website = website;
 
-    var templates = [
+    var templates = website.templates = [
         '/website/static/src/xml/website.xml'
     ];
 
diff --git a/addons/website/static/src/xml/website.editor.xml b/addons/website/static/src/xml/website.editor.xml
new file mode 100644
index 00000000000..6fbc7345b17
--- /dev/null
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -0,0 +1,56 @@
+<templates id="template" xml:space="preserve">
+    <t t-extend="website.editorbar">
+        <t t-jquery="#website-top-view" t-operation="after">
+            <div class="navbar-inner" id="website-top-edit">
+                <form class="navbar-form pull-left">
+                    <button data-action="save" class="btn btn-primary">Save</button>
+                    <button data-action="cancel" class="btn">Cancel</button>
+                </form>
+                <ul class="nav pull-right">
+                    <li><button data-action="snippet" class="btn btn-primary">Building Blocks</button></li>
+                </ul>
+            </div>
+        </t>
+    </t>
+    <t t-name="website.editor.dialog.link">
+        <div class="modal hide" tabindex="-1" role="dialog" aria-hidden="true">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+                <h3>Link to:</h3>
+            </div>
+            <div class="modal-body">
+                <form>
+                    <ul class="list-group">
+                        <li class="list-group-item active">
+                            <h3 class="list-group-item-heading">Page on Your Website</h3>
+                            <select class="form-control pages url-source"/>
+                        </li>
+                        <li class="list-group-item">
+                            <h3 class="list-group-item-heading pull-left">Website URL</h3>
+                            <div class="pull-right">
+                                <label>
+                                    <input type="checkbox" class="window-new"/>
+                                    Open in new window
+                                </label>
+                            </div>
+                            <div class="clearfix"></div>
+                            <div class="input-group">
+                                <input type="text" class="form-control url url-source"
+                                       placeholder="http://openerp.com"/>
+                            </div>
+                        </li>
+                        <li class="list-group-item">
+                            <h3 class="list-group-item-heading">Email Address</h3>
+                            <input type="email" class="form-control email-address url-source"
+                                   placeholder="you@yourwebsite.com"/>
+                        </li>
+                    </ul>
+                </form>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
+                <button type="button" class="btn btn-primary">Save changes</button>
+            </div>
+        </div>
+    </t>
+</templates>
diff --git a/addons/website/static/src/xml/website.xml b/addons/website/static/src/xml/website.xml
index 17ec64bc6bb..a03868d392b 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -27,16 +27,6 @@
                     </li>
                 </ul>
             </div>
-
-            <div class="navbar-inner" id="website-top-edit">
-                <form class="navbar-form pull-left">
-                    <button data-action="save" class="btn btn-primary">Save</button>
-                    <button data-action="cancel" class="btn">Cancel</button>
-                </form>
-                <ul class="nav pull-right">
-                    <li><button data-action="snippet" class="btn btn-primary">Building Blocks</button></li>
-                </ul>
-            </div>
         </div>
     </t>