diff --git a/plugins/poll/assets/javascripts/discourse/templates/poll.js.handlebars b/plugins/poll/assets/javascripts/discourse/templates/poll.js.handlebars
index 60061272b..ea98530eb 100644
--- a/plugins/poll/assets/javascripts/discourse/templates/poll.js.handlebars
+++ b/plugins/poll/assets/javascripts/discourse/templates/poll.js.handlebars
@@ -14,7 +14,8 @@
   {{/each}}
 </table>
 
-<button {{action toggleShowResults}} class="btn btn-small">
+<div class='row'>
+<button {{action toggleShowResults}} class="btn btn-small show-results">
   {{#if showResults}}
     <i class="fa fa-eye-slash"></i>
     {{i18n poll.results.hide}}
@@ -25,7 +26,7 @@
 </button>
 
 {{#if showToggleClosePoll}}
-  <button {{action toggleClosePoll}} class="btn btn-small">
+  <button {{action toggleClosePoll}} class="btn btn-small toggle-poll">
     {{#if poll.closed}}
       <i class="fa fa-unlock-alt"></i>
       {{i18n poll.open_poll}}
@@ -35,6 +36,7 @@
     {{/if}}
   </button>
 {{/if}}
+</div>
 
 {{#if loading}}
   <i class="fa fa-spin fa-spinner"></i>
diff --git a/plugins/poll/plugin.rb b/plugins/poll/plugin.rb
index 1d8174381..ca53eed42 100644
--- a/plugins/poll/plugin.rb
+++ b/plugins/poll/plugin.rb
@@ -158,8 +158,9 @@ register_css <<CSS
   cursor: pointer;
 }
 
-.poll-ui button:first-of-type {
-  margin-left: 20px;
+.poll-ui .row {
+  padding-left: 15px;
+  padding-top: 10px;
 }
 
 
@@ -192,4 +193,8 @@ register_css <<CSS
   margin-right: 0px;
 }
 
+.poll-ui .toggle-poll {
+  float: right;
+}
+
 CSS