diff --git a/app/assets/javascripts/app/views/channel/chat.jst.eco b/app/assets/javascripts/app/views/channel/chat.jst.eco
index 865f2fc44..4c4658a4e 100644
--- a/app/assets/javascripts/app/views/channel/chat.jst.eco
+++ b/app/assets/javascripts/app/views/channel/chat.jst.eco
@@ -1,19 +1,15 @@
 <div class="page-header">
   <div class="page-header-title">
-    <h1><%- @T('Chat') %> <small></small></h1>
+    <div class="zammad-switch zammad-switch--small js-chatSetting">
+       <input name="chat" type="checkbox" id="setting-chat" <% if @chatSetting: %>checked<% end %>>
+       <label for="setting-chat"></label>
+    </div>
+    <h1><%- @T('Chat') %></h1>
   </div>
 </div>
 <div class="page-content">
   <p><%- @T('You can create chat widgets for your webpages to allow visitors to chat with you.') %></p>
 
-  <h2><%- @T('Enable') %>/<%- @T('Disable') %></h2>
-  <form>
-    <div class="zammad-switch js-chatSetting">
-       <input name="chat" type="checkbox" id="setting-chat" <% if @chatSetting: %>checked<% end %>>
-       <label for="setting-chat"></label>
-    </div>
-  </form>
-
   <h2><%- @T('Topics') %></h2>
   <p><%- @T('You can create multiple chat topics.') %></p>
   <div class="js-topics"></div>
diff --git a/app/assets/stylesheets/zammad.scss b/app/assets/stylesheets/zammad.scss
index d1a444236..ec4c480e5 100644
--- a/app/assets/stylesheets/zammad.scss
+++ b/app/assets/stylesheets/zammad.scss
@@ -1809,10 +1809,19 @@ kbd {
   justify-content: center;
 }
 
-.page-header-title h1,
-.page-header-title h2 {
-  margin-top: 9px;
-  margin-bottom: 7px;
+.page-header-title {
+  display: flex;
+  align-items: center;
+  
+  .zammad-switch {
+    margin-right: 9px;
+  }
+
+  h1,
+  h2 {
+    margin-top: 9px;
+    margin-bottom: 7px;
+  }
 }
 
 .page-header-center {