diff --git a/src/components/poll/poll.vue b/src/components/poll/poll.vue
new file mode 100644
index 00000000..9e1a1888
--- /dev/null
+++ b/src/components/poll/poll.vue
@@ -0,0 +1,23 @@
+<template>
+  <poll-results v-if="currentUserHasVoted" :poll="poll" />
+  <poll-vote v-else :poll="poll" />
+</template>
+
+<script>
+import PollResults from './poll_results/poll_results.vue'
+import PollVote from './poll_vote/poll_vote.vue'
+
+export default {
+  name: 'Poll',
+  props: ['poll'],
+  components: {
+    PollResults,
+    PollVote
+  },
+  computed: {
+    currentUserHasVoted () {
+      return false
+    }
+  }
+}
+</script>
diff --git a/src/components/poll/poll_form/poll_form.vue b/src/components/poll/poll_form/poll_form.vue
index 975c19a7..e6cc6a52 100644
--- a/src/components/poll/poll_form/poll_form.vue
+++ b/src/components/poll/poll_form/poll_form.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="poll-form">
+  <div class="poll-form" v-if="visible">
     <hr />
     <div class="poll-option"
       v-for="(option, index) in options"
@@ -30,6 +30,7 @@ const maxOptions = 10
 
 export default {
   name: 'PollForm',
+  props: ['visible'],
   computed: {
     optionsLength: function () {
       return this.$store.state.poll.pollOptions.length
diff --git a/src/components/poll/poll_icon/poll_icon.vue b/src/components/poll/poll_icon/poll_icon.vue
deleted file mode 100644
index 9bbadf2c..00000000
--- a/src/components/poll/poll_icon/poll_icon.vue
+++ /dev/null
@@ -1,18 +0,0 @@
-<template>
-  <div class="poll">
-    <label class="btn btn-default" :title="$t('tool_tip.poll')">
-      <i class="icon-chart-bar"></i>
-    </label>
-  </div>
-</template>
-
-<style>
-.poll {
-  font-size: 26px;
-  flex: 1;
-}
-
-.icon-chart-bar {
-  cursor: pointer;
-}
-</style>
diff --git a/src/components/poll/poll_status/poll_status.vue b/src/components/poll/poll_results/poll_results.vue
similarity index 85%
rename from src/components/poll/poll_status/poll_status.vue
rename to src/components/poll/poll_results/poll_results.vue
index dd0a2b17..85d95d73 100644
--- a/src/components/poll/poll_status/poll_status.vue
+++ b/src/components/poll/poll_results/poll_results.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="poll-status">
+  <div class="poll-results">
     <div class="votes">
       <div
         class="poll-option"
@@ -23,7 +23,7 @@
 
 <script>
 export default {
-  name: 'PollStatus',
+  name: 'PollResults',
   props: ['poll'],
   computed: {
     totalVotesCount () {
@@ -32,18 +32,14 @@ export default {
   },
   methods: {
     percentageForOption: function (count) {
-      if (this.totalVotesCount === 0) {
-        return 0
-      }
-
-      return (count / this.totalVotesCount * 100).toFixed(1)
+      return (this.totalVotesCount === 0 ? 0 : (count / this.totalVotesCount * 100)).toFixed(1)
     }
   }
 }
 </script>
 
 <style lang="scss">
-.poll-status {
+.poll-results {
   margin: 0.7em 0;
   .votes {
     display: table;
diff --git a/src/components/poll/poll_vote/poll_vote.vue b/src/components/poll/poll_vote/poll_vote.vue
new file mode 100644
index 00000000..d91dff54
--- /dev/null
+++ b/src/components/poll/poll_vote/poll_vote.vue
@@ -0,0 +1,59 @@
+<template>
+  <div class="poll-vote" v-bind:class="containerClass">
+    <div
+      class="poll-choice"
+      v-for="(pollOption, index) in poll.votes"
+      :key="index">
+        <input
+          :disabled="loading"
+          type="radio"
+          :id="optionID(index)"
+          :value="pollOption.name"
+          name="choice"
+          @change="onChoice">
+        <label :for="optionID(index)">{{pollOption.name}}</label>
+    </div>
+  </div>
+
+</template>
+
+<script>
+export default {
+  name: 'PollVote',
+  props: ['poll'],
+  data () {
+    return {
+      loading: false
+    }
+  },
+  computed: {
+    containerClass: function () {
+      return {
+        loading: this.loading
+      }
+    }
+  },
+  methods: {
+    optionID (index) {
+      return `pollOption${index}`
+    },
+    onChoice (e) {
+      this.loading = true
+      console.log(e.target.value)
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+.poll-vote {
+  margin: 0.7em 0 0;
+
+  &.loading * {
+    cursor: progress;
+  }
+  .poll-choice {
+    padding: 0.4em 0;
+  }
+}
+</style>
diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index 94d78fea..52c1b900 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -85,7 +85,8 @@ const PostStatusForm = {
         visibility: scope,
         contentType
       },
-      caret: 0
+      caret: 0,
+      pollFormVisible: false
     }
   },
   computed: {
@@ -343,6 +344,9 @@ const PostStatusForm = {
     },
     changeVis (visibility) {
       this.newStatus.visibility = visibility
+    },
+    togglePollForm () {
+      this.pollFormVisible = !this.pollFormVisible
     }
   }
 }
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 8da9d29a..0579836c 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -71,10 +71,17 @@
           </div>
         </div>
       </div>
-      <poll-form />
+      <poll-form :visible="pollFormVisible" />
       <div class='form-bottom'>
         <media-upload ref="mediaUpload" @uploading="disableSubmit" @uploaded="addMediaFile" @upload-failed="uploadFailed" :drop-files="dropFiles"></media-upload>
-        <poll-icon />
+        <div class="poll-icon">
+          <label
+            class="btn btn-default"
+            :title="$t('tool_tip.poll')"
+            @click="togglePollForm">
+            <i class="icon-chart-bar"></i>
+          </label>
+        </div>
         <p v-if="isOverLengthLimit" class="error">{{ charactersLeft }}</p>
         <p class="faint" v-else-if="hasStatusLengthLimit">{{ charactersLeft }}</p>
 
@@ -268,4 +275,12 @@
     z-index: 4;
   }
 }
+.poll-icon {
+  font-size: 26px;
+  flex: 1;
+}
+
+.icon-chart-bar {
+  cursor: pointer;
+}
 </style>
diff --git a/src/components/settings/settings.vue b/src/components/settings/settings.vue
index 6ee103c7..32315895 100644
--- a/src/components/settings/settings.vue
+++ b/src/components/settings/settings.vue
@@ -327,7 +327,6 @@
     min-width: 10em;
   }
 
-
   textarea {
     width: 100%;
     height: 100px;
diff --git a/src/components/status/status.js b/src/components/status/status.js
index cd420c3e..af19abac 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -2,7 +2,7 @@ import Attachment from '../attachment/attachment.vue'
 import FavoriteButton from '../favorite_button/favorite_button.vue'
 import RetweetButton from '../retweet_button/retweet_button.vue'
 import DeleteButton from '../delete_button/delete_button.vue'
-import PollStatus from '../poll/poll_status/poll_status.vue'
+import Poll from '../poll/poll.vue'
 import PostStatusForm from '../post_status_form/post_status_form.vue'
 import UserCard from '../user_card/user_card.vue'
 import UserAvatar from '../user_avatar/user_avatar.vue'
@@ -266,7 +266,7 @@ const Status = {
     RetweetButton,
     DeleteButton,
     PostStatusForm,
-    PollStatus,
+    Poll,
     UserCard,
     UserAvatar,
     Gallery,
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index afc607d0..b10de57e 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -111,7 +111,7 @@
           </div>
 
           <div v-if="status.poll.votes">
-            <poll-status :poll="status.poll" />
+            <poll :poll="status.poll" />
           </div>
 
           <div v-if="status.attachments && (!hideSubjectStatus || showingLongSubject)" class="attachments media-body">