diff --git a/app/assets/javascripts/app/controllers/_application_controller_generic.js.coffee b/app/assets/javascripts/app/controllers/_application_controller_generic.js.coffee
index 4ddb37ae5..ba277a9d0 100644
--- a/app/assets/javascripts/app/controllers/_application_controller_generic.js.coffee
+++ b/app/assets/javascripts/app/controllers/_application_controller_generic.js.coffee
@@ -511,11 +511,11 @@ class App.Sidebar extends App.Controller
             )
 
   toggleSidebar: ->
-    @el.parent().find('.tabsSidebarSpace').toggleClass('is-closed')
+    @el.parent().find('.tabsSidebar-sidebarSpacer').toggleClass('is-closed')
     @el.parent().find('.tabsSidebar').toggleClass('is-closed')
 
   showSidebar: ->
-    @el.parent().find('.tabsSidebarSpace').removeClass('is-closed')
+    @el.parent().find('.tabsSidebar-sidebarSpacer').removeClass('is-closed')
     @el.parent().find('.tabsSidebar').removeClass('is-closed')
 
   toggleTab: (e) ->
diff --git a/app/assets/javascripts/app/views/agent_ticket_create.jst.eco b/app/assets/javascripts/app/views/agent_ticket_create.jst.eco
index 067f3d155..9bcb00609 100644
--- a/app/assets/javascripts/app/views/agent_ticket_create.jst.eco
+++ b/app/assets/javascripts/app/views/agent_ticket_create.jst.eco
@@ -1,5 +1,5 @@
 <div class="tabsSidebar-holder">
-  <div class="main no-padding flex tabsSidebarSpace">
+  <div class="main no-padding flex tabsSidebar-sidebarSpacer tabsSidebar-tabsSpacer">
     <div class="newTicket">
       <div class="box">
         <div class="page-header">
diff --git a/app/assets/javascripts/app/views/layout_ref/content_sidebar_tabs_right.jst.eco b/app/assets/javascripts/app/views/layout_ref/content_sidebar_tabs_right.jst.eco
index c2af4d756..51d6fdeec 100644
--- a/app/assets/javascripts/app/views/layout_ref/content_sidebar_tabs_right.jst.eco
+++ b/app/assets/javascripts/app/views/layout_ref/content_sidebar_tabs_right.jst.eco
@@ -1,5 +1,5 @@
 <div class="tabsSidebar-holder flex horizontal">
-  <div class="main flex tabsSidebarSpace">
+  <div class="main flex tabsSidebar-sidebarSpacer tabsSidebar-tabsSpacer">
     <h1>content</h1>
 
     <p>
diff --git a/app/assets/javascripts/app/views/organization_zoom.jst.eco b/app/assets/javascripts/app/views/organization_zoom.jst.eco
index 9602bb896..c2cf224d6 100644
--- a/app/assets/javascripts/app/views/organization_zoom.jst.eco
+++ b/app/assets/javascripts/app/views/organization_zoom.jst.eco
@@ -1,6 +1,6 @@
 <div class="flex vertical">
   <div class="flex u-positionOrigin horizontal">
-    <div class="main flex tabsSidebarSpace">
+    <div class="main flex tabsSidebar-sidebarSpacer tabsSidebar-tabsSpacer">
       <div class="organizationZoom">
         <div class="page-header">
           <h1><%- @T( @head ) %></h1>
diff --git a/app/assets/javascripts/app/views/ticket_zoom.jst.eco b/app/assets/javascripts/app/views/ticket_zoom.jst.eco
index 75d63c75e..59582e458 100644
--- a/app/assets/javascripts/app/views/ticket_zoom.jst.eco
+++ b/app/assets/javascripts/app/views/ticket_zoom.jst.eco
@@ -1,6 +1,6 @@
 <div class="tabsSidebar-holder flex vertical">
   <div class="flex u-positionOrigin horizontal">
-    <div class="main no-padding flex tabsSidebarSpace">
+    <div class="main no-padding flex tabsSidebar-sidebarSpacer tabsSidebar-tabsSpacer">
       <div class="ticketZoom">
         <div class="page-header horizontal">
           <div class="flex vertical center">
diff --git a/app/assets/javascripts/app/views/user_zoom.jst.eco b/app/assets/javascripts/app/views/user_zoom.jst.eco
index ea1ca64a6..7f610da3f 100644
--- a/app/assets/javascripts/app/views/user_zoom.jst.eco
+++ b/app/assets/javascripts/app/views/user_zoom.jst.eco
@@ -1,6 +1,6 @@
 <div class="tabsSidebar-holder flex vertical">
   <div class="flex u-positionOrigin horizontal">
-    <div class="main flex tabsSidebarSpace">
+    <div class="main flex tabsSidebar-sidebarSpacer tabsSidebar-tabsSpacer">
       <div class="userZoom">
         <div class="page-header">
           <h1><%- @T( @head ) %></h1>