diff --git a/src/components/poll/poll_form/poll_form.vue b/src/components/poll/poll_form/poll_form.vue
index e6cc6a52..7cb5c949 100644
--- a/src/components/poll/poll_form/poll_form.vue
+++ b/src/components/poll/poll_form/poll_form.vue
@@ -42,17 +42,16 @@ export default {
   methods: {
     onAddOption () {
       if (this.optionsLength < maxOptions) {
-        this.$store.commit('addPollOption', '')
+        this.$store.dispatch('addPollOption', { option: '' })
       }
     },
     onDeleteOption (index) {
-      console.log(index)
       if (this.optionsLength > 1) {
-        this.$store.commit('deletePollOption', index)
+        this.$store.dispatch('deletePollOption', { index })
       }
     },
     onUpdateOption (e, index) {
-      this.$store.commit('updatePollOption', { index, option: e.target.value })
+      this.$store.dispatch('updatePollOption', { index, option: e.target.value })
     }
   }
 }
diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index 847cdf1d..9c2ad723 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -275,6 +275,8 @@ const PostStatusForm = {
             visibility: newStatus.visibility,
             contentType: newStatus.contentType
           }
+          this.$store.dispatch('swapPollOptions', { options: ['', ''] })
+          this.pollFormVisible = false
           this.$refs.mediaUpload.clearFile()
           this.$emit('posted')
           let el = this.$el.querySelector('textarea')
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 773ccc58..2c68c28b 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -74,7 +74,7 @@
           </div>
         </div>
       </div>
-      <poll-form :visible="pollFormVisible" />
+      <poll-form :visible="pollFormVisible" :options="newStatus.pollOptions" />
       <div class='form-bottom'>
         <media-upload ref="mediaUpload" @uploading="disableSubmit" @uploaded="addMediaFile" @upload-failed="uploadFailed" :drop-files="dropFiles"></media-upload>
         <div class="poll-icon">
diff --git a/src/modules/poll.js b/src/modules/poll.js
index 39d28556..e0082991 100644
--- a/src/modules/poll.js
+++ b/src/modules/poll.js
@@ -3,14 +3,31 @@ const poll = {
     pollOptions: ['', '']
   },
   mutations: {
-    addPollOption (state, option) {
+    ADD_OPTION (state, { option }) {
       state.pollOptions.push(option)
     },
-    updatePollOption (state, { index, option }) {
+    UPDATE_OPTION (state, { index, option }) {
       state.pollOptions[index] = option
     },
-    deletePollOption (state, index) {
+    DELETE_OPTION (state, { index }) {
       state.pollOptions.splice(index, 1)
+    },
+    SWAP_OPTIONS (state, { options }) {
+      state.pollOptions = options
+    }
+  },
+  actions: {
+    addPollOption (store, { option }) {
+      store.commit('ADD_OPTION', { option })
+    },
+    updatePollOption (store, { index, option }) {
+      store.commit('UPDATE_OPTION', { index, option })
+    },
+    deletePollOption (store, { index }) {
+      store.commit('DELETE_OPTION', { index })
+    },
+    swapPollOptions (store, { options }) {
+      store.commit('SWAP_OPTIONS', { options })
     }
   }
 }