diff --git a/assets/javascripts/discourse/templates/admin/plugins-chat-integration.hbs b/assets/javascripts/discourse/templates/admin/plugins-chat-integration.hbs
index 7c12bb7..566b006 100644
--- a/assets/javascripts/discourse/templates/admin/plugins-chat-integration.hbs
+++ b/assets/javascripts/discourse/templates/admin/plugins-chat-integration.hbs
@@ -1,6 +1,6 @@
 <div id="admin-plugin-chat">
   <div class="admin-controls">
-    <div class="span15">
+    <div class="admin-controls-chat-providers">
       <ul class="nav nav-pills">
         {{#each model as |provider|}}
           {{nav-item
@@ -12,14 +12,12 @@
       </ul>
     </div>
 
-    <div class="pull-right">
-      {{d-button
-        action=(route-action "showSettings")
-        icon="cog"
-        title="chat_integration.settings"
-        label="chat_integration.settings"
-      }}
-    </div>
+    {{d-button
+      action=(route-action "showSettings")
+      icon="cog"
+      title="chat_integration.settings"
+      label="chat_integration.settings"
+    }}
   </div>
 
   {{#unless model.totalRows}}
diff --git a/assets/stylesheets/chat-integration-admin.scss b/assets/stylesheets/chat-integration-admin.scss
index 09d3e0b..fc4d2a1 100644
--- a/assets/stylesheets/chat-integration-admin.scss
+++ b/assets/stylesheets/chat-integration-admin.scss
@@ -47,6 +47,17 @@
       overflow: auto;
     }
   }
+
+  .admin-controls {
+    padding: 10px;
+    .nav-pills {
+      padding: 0;
+    }
+  }
+}
+
+.admin-controls-chat-providers {
+  margin-right: auto;
 }
 
 #chat-integration-edit-channel-modal,