diff --git a/templates/chat.tpl b/templates/chat.tpl
index 3242481..3084f28 100644
--- a/templates/chat.tpl
+++ b/templates/chat.tpl
@@ -6,30 +6,7 @@
 				<button id="chat-close-btn" type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
 				<button type="button" class="close hidden-xs hidden-sm" data-action="maximize"><span aria-hidden="true"><i class="fa fa-expand"></i></span><span class="sr-only">[[modules:chat.maximize]]</span></button>
 				<button type="button" class="close hidden-xs hidden-sm" data-action="minimize"><span aria-hidden="true"><i class="fa fa-minus"></i></span><span class="sr-only">[[modules:chat.minimize]]</span></button>
-				<div class="dropdown pull-right">
-					<button class="close" data-toggle="dropdown" component="chat/controlsToggle"><i class="fa fa-gear"></i></button>
-					<ul class="dropdown-menu dropdown-menu-right pull-right" component="chat/controls">
-						<li class="dropdown-header">[[modules:chat.options]]</li>
-						<li>
-							<a href="#" data-action="members"><i class="fa fa-fw fa-cog"></i> [[modules:chat.manage-room]]</a>
-						</li>
-						<li>
-							<a href="#" data-action="rename"><i class="fa fa-fw fa-edit"></i> [[modules:chat.rename-room]]</a>
-						</li>
-						<li>
-							<a href="#" data-action="leave"><i class="fa fa-fw fa-sign-out"></i> [[modules:chat.leave]]</a>
-						</li>
-						<!-- IF users.length -->
-						<li role="separator" class="divider"></li>
-						<li class="dropdown-header">[[modules:chat.in-room]]</li>
-						{{{each users}}}
-						<li>
-							<a href="{config.relative_path}/uid/{../uid}">{buildAvatar(users, "sm", true)} {../username}</a>
-						</li>
-						{{{end}}}
-						<!-- END -->
-					</ul>
-				</div>
+				<!-- IMPORT partials/chats/options.tpl -->
 
 				<h4 component="chat/room/name"><!-- IF roomName -->{roomName}<!-- ELSE -->{usernames}<!-- ENDIF roomName --></h4>
 			</div>
diff --git a/templates/partials/chats/message-window.tpl b/templates/partials/chats/message-window.tpl
index 9898774..ac7ab8a 100644
--- a/templates/partials/chats/message-window.tpl
+++ b/templates/partials/chats/message-window.tpl
@@ -4,30 +4,7 @@
 		<button type="button" class="close" data-action="pop-out"><span aria-hidden="true"><i class="fa fa-compress"></i></span><span class="sr-only">[[modules:chat.pop-out]]</span></button>
 		<button type="button" class="close" aria-label="Close" data-action="close"><span aria-hidden="true">&times;</span></button>
 
-		<div class="dropdown pull-right">
-			<button class="close" data-toggle="dropdown" component="chat/controlsToggle"><i class="fa fa-gear"></i></button>
-			<ul class="dropdown-menu dropdown-menu-right pull-right" component="chat/controls">
-				<li class="dropdown-header">[[modules:chat.options]]</li>
-				<li>
-					<a href="#" data-action="members"><i class="fa fa-fw fa-cog"></i> [[modules:chat.manage-room]]</a>
-				</li>
-				<li>
-					<a href="#" data-action="rename"><i class="fa fa-fw fa-edit"></i> [[modules:chat.rename-room]]</a>
-				</li>
-				<li>
-					<a href="#" data-action="leave"><i class="fa fa-fw fa-sign-out"></i> [[modules:chat.leave]]</a>
-				</li>
-				<!-- IF users.length -->
-				<li role="separator" class="divider"></li>
-				<li class="dropdown-header">[[modules:chat.in-room]]</li>
-				{{{each users}}}
-				<li>
-					<a href="{config.relative_path}/uid/{../uid}">{buildAvatar(users, "sm", true)} {../username}</a>
-				</li>
-				{{{end}}}
-				<!-- END -->
-			</ul>
-		</div>
+		<!-- IMPORT partials/chats/options.tpl -->
 		<span class="members">
 			[[modules:chat.chatting_with]]:
 			{{{each users}}}
diff --git a/templates/partials/chats/options.tpl b/templates/partials/chats/options.tpl
new file mode 100644
index 0000000..3cb8cc2
--- /dev/null
+++ b/templates/partials/chats/options.tpl
@@ -0,0 +1,24 @@
+<div class="dropdown pull-right">
+  <button class="close" data-toggle="dropdown" component="chat/controlsToggle"><i class="fa fa-gear"></i></button>
+  <ul class="dropdown-menu dropdown-menu-right pull-right" component="chat/controls">
+    <li class="dropdown-header">[[modules:chat.options]]</li>
+    <li>
+      <a href="#" data-action="members"><i class="fa fa-fw fa-cog"></i> [[modules:chat.manage-room]]</a>
+    </li>
+    <li>
+      <a href="#" data-action="rename"><i class="fa fa-fw fa-edit"></i> [[modules:chat.rename-room]]</a>
+    </li>
+    <li>
+      <a href="#" data-action="leave"><i class="fa fa-fw fa-sign-out"></i> [[modules:chat.leave]]</a>
+    </li>
+    <!-- IF users.length -->
+    <li role="separator" class="divider"></li>
+    <li class="dropdown-header">[[modules:chat.in-room]]</li>
+    {{{each users}}}
+    <li>
+      <a href="{config.relative_path}/uid/{../uid}">{buildAvatar(users, "sm", true)} {../username}</a>
+    </li>
+    {{{end}}}
+    <!-- END -->
+  </ul>
+</div>