diff --git a/templates/composer.tpl b/templates/composer.tpl
index 4a45725..146596b 100644
--- a/templates/composer.tpl
+++ b/templates/composer.tpl
@@ -85,17 +85,18 @@
 				</div>
 
 				<div class="btn-group pull-right action-bar hidden-sm hidden-xs">
-					<button class="btn btn-default" data-action="discard" tabindex="-1"><i class="fa fa-times"></i> [[topic:composer.discard]]</button>
+					<button class="btn btn-default composer-discard" tabindex="-1"><i class="fa fa-times"></i> [[topic:composer.discard]]</button>
 
-					<button class="btn btn-primary" data-action="post" tabindex="6"><i class="fa fa-check"></i> [[topic:composer.submit]]</button>
+					<button class="btn btn-primary composer-submit" data-action="post" tabindex="6"><i class="fa fa-check"></i> [[topic:composer.submit]]</button>
 					<!-- IF !isEditing -->
 					<!-- IF isAdminOrMod -->
-					<button type="button" class="btn btn-info dropdown-toggle" data-toggle="dropdown">
+					<button type="button" class="btn btn-info dropdown-toggle" tabindex="7" data-toggle="dropdown">
 						<span class="caret"></span>
 						<span class="sr-only">Toggle Dropdown</span>
 					</button>
 					<ul class="dropdown-menu pull-right" role="menu">
-						<li><a href="#" data-action="post-lock"><i class="fa fa-fw fa-lock"></i> [[modules:composer.submit_and_lock]]</a></li>
+						<li><a href="#" data-switch-action="post"><i class="fa fa-fw fa-check"></i> [[topic:composer.submit]]</a></li>
+						<li><a href="#" data-switch-action="post-lock"><i class="fa fa-fw fa-lock"></i> [[modules:composer.submit_and_lock]]</a></li>
 					</ul>
 					<!-- ENDIF isAdminOrMod -->
 					<!-- ENDIF !isEditing -->