diff --git a/stock_vertical_lift/models/vertical_lift_shuttle.py b/stock_vertical_lift/models/vertical_lift_shuttle.py
index 1d5670acc..bb82f17f0 100644
--- a/stock_vertical_lift/models/vertical_lift_shuttle.py
+++ b/stock_vertical_lift/models/vertical_lift_shuttle.py
@@ -177,6 +177,12 @@ class VerticalLiftShuttle(models.Model):
             "res_id": self.id,
         }
 
+    def action_back_to_settings(self):
+        action_xmlid = "stock_vertical_lift.vertical_lift_shuttle_action"
+        action = self.env.ref(action_xmlid).read()[0]
+        action["target"] = "main"
+        return action
+
     def action_manual_barcode(self):
         return {
             "type": "ir.actions.act_window",
diff --git a/stock_vertical_lift/static/src/js/vertical_lift.js b/stock_vertical_lift/static/src/js/vertical_lift.js
index 1bc89e87c..28853f2b3 100644
--- a/stock_vertical_lift/static/src/js/vertical_lift.js
+++ b/stock_vertical_lift/static/src/js/vertical_lift.js
@@ -2,10 +2,7 @@ odoo.define('stock_vertical_lift.vertical_lift', function (require) {
     "use strict";
 
     var KanbanRecord = require('web.KanbanRecord');
-    var basicFields = require('web.basic_fields');
-    var field_registry = require('web.field_registry');
     var FormController = require('web.FormController');
-    var FieldInteger = basicFields.FieldInteger;
 
     KanbanRecord.include({
 
@@ -27,27 +24,6 @@ odoo.define('stock_vertical_lift.vertical_lift', function (require) {
 
     });
 
-    var ExitButton = FieldInteger.extend({
-        tagName: 'button',
-        className: 'btn btn-danger btn-block btn-lg o_shuttle_exit',
-        events: {
-            'click': '_onClick',
-        },
-        _render: function () {
-            this.$el.text(this.string);
-        },
-        _onClick: function () {
-            // The only reason to have this field widget is to be able
-            // to inject clear_breadcrumbs in the action:
-            // it will revert back to a normal - non-headless - view
-            this.do_action('stock_vertical_lift.vertical_lift_shuttle_action', {
-                clear_breadcrumbs: true,
-            });
-        },
-
-    });
-
-
     FormController.include({
         init: function () {
             this._super.apply(this, arguments);
@@ -94,10 +70,7 @@ odoo.define('stock_vertical_lift.vertical_lift', function (require) {
 
     });
 
-    field_registry.add('vlift_shuttle_exit_button', ExitButton);
 
-    return {
-        ExitButton: ExitButton,
-    };
+    return {};
 
 });
diff --git a/stock_vertical_lift/static/src/scss/vertical_lift.scss b/stock_vertical_lift/static/src/scss/vertical_lift.scss
index 8cd7878aa..5421618db 100644
--- a/stock_vertical_lift/static/src/scss/vertical_lift.scss
+++ b/stock_vertical_lift/static/src/scss/vertical_lift.scss
@@ -103,10 +103,6 @@
             font-size: 2em;
             text-transform: uppercase;
         }
-
-        .o_shuttle_exit {
-            text-align: center;
-        }
     }
 
     .o_vlift_shuttle_popup {
diff --git a/stock_vertical_lift/views/vertical_lift_shuttle_views.xml b/stock_vertical_lift/views/vertical_lift_shuttle_views.xml
index 104b61707..5cad32a6d 100644
--- a/stock_vertical_lift/views/vertical_lift_shuttle_views.xml
+++ b/stock_vertical_lift/views/vertical_lift_shuttle_views.xml
@@ -23,8 +23,10 @@
                             class="btn-primary btn-block btn btn-lg"/>
                     </div>
                     <div class="col-6">
-                        <field name="id" string="Back to settings"
-                            widget="vlift_shuttle_exit_button" readonly="1"/>
+                        <button name="action_back_to_settings"
+                            type="object"
+                            string="Back to settings"
+                            class="btn-danger btn-block btn-lg" />
                     </div>
                 </div>
                 <footer></footer>