diff --git a/client/coral-plugin-flags/FlagButton.js b/client/coral-plugin-flags/FlagButton.js
index e749ffa34..bb96c3cdf 100644
--- a/client/coral-plugin-flags/FlagButton.js
+++ b/client/coral-plugin-flags/FlagButton.js
@@ -14,7 +14,7 @@ class FlagButton extends Component {
     itemType: '',
     detail: '',
     otherText: '',
-    step: 1
+    step: 0
   }
 
   onReportClick = () => {
@@ -30,7 +30,11 @@ class FlagButton extends Component {
     const {postAction, addItem, updateItem, flag, id, author_id} = this.props;
     const {itemType, field, detail, step, otherText} = this.state;
 
-    this.setState({step: step + 1});
+    if (step + 1 >= this.getPopupMenu.length) {
+      this.setState({showMenu: false});
+    } else {
+      this.setState({step: step + 1});
+    }
 
     if (itemType && detail) {
       const updatedDetail = otherText || detail;
@@ -49,9 +53,8 @@ class FlagButton extends Component {
     }
   }
 
-  getPopupMenu = (step) => {
-    switch(step) {
-    case 1: {
+  getPopupMenu = [
+    () => {
       return {
         header: lang.t('step-1-header'),
         options: [
@@ -61,9 +64,9 @@ class FlagButton extends Component {
         button: lang.t('continue'),
         sets: 'itemType'
       };
-    }
-    case 2: {
-      const options = this.state.itemType === 'comments' ?
+    },
+    (itemType) => {
+      const options = itemType === 'comments' ?
       [
         {val: 'I don\'t agree with this comment', text: lang.t('no-agree-comment')},
         {val: 'This comment is offensive', text: lang.t('comment-offensive')},
@@ -82,14 +85,15 @@ class FlagButton extends Component {
         button: lang.t('continue'),
         sets: 'detail'
       };
-    }
-    case 3: {
+    },
+    () =>  {
       return {
         header: lang.t('step-3-header'),
-        text: lang.t('thank-you')
+        text: lang.t('thank-you'),
+        button: lang.t('done'),
       };
-    }}
-  }
+    }
+  ]
 
   onPopupOptionClick = (sets) => (e) => {
     if(sets === 'detail' && e.target.value === 'other') {
@@ -115,7 +119,7 @@ class FlagButton extends Component {
   render () {
     const {flag} = this.props;
     const flagged = flag && flag.current_user;
-    const popupMenu = this.getPopupMenu(this.state.step);
+    const popupMenu = this.getPopupMenu[this.state.step](this.state.itemType);
 
     return <div className={`${name}-container`}>
       <button onClick={this.onReportClick} className={`${name}-button`}>
@@ -169,7 +173,7 @@ class FlagButton extends Component {
               </form>
             }
             <div className={`${name}-popup-counter`}>
-              {this.state.step} of 3
+              {this.state.step + 1} of {this.getPopupMenu.length}
             </div>
             {
               popupMenu.button && <Button
diff --git a/client/coral-plugin-flags/translations.json b/client/coral-plugin-flags/translations.json
index 1b5bee21b..1e48c9d58 100644
--- a/client/coral-plugin-flags/translations.json
+++ b/client/coral-plugin-flags/translations.json
@@ -10,6 +10,7 @@
     "flag-username": "Flag username",
     "flag-comment": "Flag comment",
     "continue": "Continue",
+    "done": "Done",
     "no-agree-comment": "I don't agree with this comment",
     "comment-offensive": "This comment is offensive",
     "personal-info": "This comment reveals personally identifiable information",
@@ -31,6 +32,7 @@
     "flag-username": "¡traduceme!",
     "flag-comment": "¡traduceme!",
     "continue": "¡traduceme!",
+    "done": "¡traduceme!",
     "no-agree-comment": "¡traduceme!",
     "comment-offensive": "¡traduceme!",
     "personal-info": "¡traduceme!",
@@ -38,7 +40,7 @@
     "no-like-username": "¡traduceme!",
     "marketing": "¡traduceme!",
     "thank-you": "¡traduceme!",
-    "flag-reason": "Reason for flag",
+    "flag-reason": "¡traduceme!",
     "other": "¡traduceme!"
   }
 }