diff --git a/app/src/main/java/app/fedilab/android/activities/TootActivity.java b/app/src/main/java/app/fedilab/android/activities/TootActivity.java
index 081c12837..8e9e283d2 100644
--- a/app/src/main/java/app/fedilab/android/activities/TootActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/TootActivity.java
@@ -2807,6 +2807,7 @@ public class TootActivity extends BaseActivity implements OnPostActionInterface,
         int max_entry = 4;
         int max_length = 25;
         pollCountItem = 2;
+        remove.setVisibility(View.GONE);
         if( MainActivity.poll_limits != null && MainActivity.poll_limits.containsKey("max_options")){
             max_entry = MainActivity.poll_limits.get("max_options")!=null?MainActivity.poll_limits.get("max_options"):4;
         }
@@ -2889,6 +2890,13 @@ public class TootActivity extends BaseActivity implements OnPostActionInterface,
                 }
                 i++;
             }
+            remove.setVisibility(View.VISIBLE);
+            add.setVisibility(View.VISIBLE);
+            if(poll.getOptionsList().size() >= max_entry){
+                add.setVisibility(View.GONE);
+            }else if( poll.getOptionsList().size() <= 2 ){
+                remove.setVisibility(View.GONE);
+            }
             switch (poll.getExpires_in()){
                 case 300:
                     poll_duration.setSelection(0);