diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 47d955d808e..602033051b3 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -860,10 +860,6 @@ openerp.web.form.FormRenderingEngine = openerp.web.Class.extend({
                 w.replace($elem);
             }
         });
-        
-        if (openerp.connection.debug) {
-            $('<button>Outline Form Layout</button>').appendTo(this.$element).click($.proxy(this.toggle_layout_debugging, this));
-        }
     },
     render_element: function(template, layout/* dictionaries */) {
         var dicts = [].slice.call(arguments).slice(2);
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 04af82256bf..fa8f910185b 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -558,6 +558,9 @@ session.web.ViewManagerAction = session.web.ViewManager.extend({
                     });
                 }
                 break;
+            case 'toggle_layout_outline':
+                current_view.rendering_engine.toggle_layout_debugging();
+                break;
             case 'fields':
                 this.dataset.call_and_eval(
                         'fields_get', [false, {}], null, 1).then(function (fields) {
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 2806d57ce1d..1153a65852f 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -445,6 +445,7 @@
 <t t-name="ViewManagerDebug">
     <option value="">Debug View#<t t-esc="view.fields_view.view_id"/></option>
     <option t-if="_.indexOf(['form', 'page'], view_manager.active_view) gt -1" value="perm_read" data-views="form,page">View Log (perm_read)</option>
+    <option t-if="view_manager.active_view === 'form'" value="toggle_layout_outline">Toggle Form Layout Outline</option>
     <option value="fields">View Fields</option>
     <option value="fvg">Fields View Get</option>
     <t t-if="view_manager.session.uid === 1">