diff --git a/src/sunstone/public/js/plugins/templates-tab.js b/src/sunstone/public/js/plugins/templates-tab.js
index bc0d35c0fe..ccbef38672 100644
--- a/src/sunstone/public/js/plugins/templates-tab.js
+++ b/src/sunstone/public/js/plugins/templates-tab.js
@@ -2114,7 +2114,7 @@ function wizard_tab_content(){
 
     if (Config.isTemplateCreationTabEnabled('storage')){
         str +=
-        '<div id="storageTab" class="wizard_tab content">'+
+        '<div id="storageTab" class="wizard_tab content bordered-tabs">'+
           '<dl class="tabs vertical" id="template_create_storage_tabs" data-tab>'+
             '<dt class="text-center"><button type="button" class="button tiny radius" id="tf_btn_disks"><span class="fa fa-plus"></span>'+tr("Add another disk")+'</button></dt>'+
           '</dl>'+
diff --git a/src/sunstone/public/js/sunstone.js b/src/sunstone/public/js/sunstone.js
index 40d7a31d47..2474c08cf7 100644
--- a/src/sunstone/public/js/sunstone.js
+++ b/src/sunstone/public/js/sunstone.js
@@ -235,7 +235,7 @@ var Sunstone = {
             var active_tab_href = active_tab.attr('href');
         }
 
-        var dl_tabs = $('<div id="'+panel_name+'">\
+        var dl_tabs = $('<div id="'+panel_name+'" class="bordered-tabs">\
             <dl class="tabs right-info-tabs text-center" data-tab>\
             </dl>\
             <div class="tabs-content"></div>\