diff --git a/src/opnsense/www/js/opnsense_widget_manager.js b/src/opnsense/www/js/opnsense_widget_manager.js
index cfaef124d..c98f7b5c7 100644
--- a/src/opnsense/www/js/opnsense_widget_manager.js
+++ b/src/opnsense/www/js/opnsense_widget_manager.js
@@ -250,10 +250,11 @@ class WidgetManager  {
 
     _renderHeader() {
         // Serialization options
-        let $btn_group = $('.btn-group-container');
+        let $btn_group_container = $('.btn-group-container');
+        let $btn_group = $('<div\>').addClass('btn-group');
 
         // Append Save button and directly next to it, a hidden spinner
-        $btn_group.append($(`
+        $btn_group_container.append($(`
             <button class="btn btn-primary" id="save-grid">
                 <span id="save-btn-text" class="show">${this.gettext.save}</span>
                 <span id="icon-container">
@@ -275,6 +276,9 @@ class WidgetManager  {
             </button>
         `));
 
+        // Append the button group to the container
+        $btn_group.appendTo($btn_group_container);
+
         // Initially hide the save button
         $('#save-grid').hide();