diff --git a/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java b/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
index cfd1eb6fe..403b9b0a8 100644
--- a/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
+++ b/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
@@ -123,6 +123,7 @@ public class  ComposeActivity extends BaseActivity implements ComposeOptionsFrag
     private ImageButton pickBtn;
     private Button nsfwBtn;
     private ProgressBar postProgress;
+    private ImageButton visibilityBtn;
 
     private static class QueuedMedia {
         enum Type {
@@ -342,15 +343,12 @@ public class  ComposeActivity extends BaseActivity implements ComposeOptionsFrag
         floatingBtn = (Button) findViewById(R.id.floating_btn);
         pickBtn = (ImageButton) findViewById(R.id.compose_photo_pick);
         nsfwBtn = (Button) findViewById(R.id.action_toggle_nsfw);
-        final ImageButton visibilityBtn = (ImageButton) findViewById(R.id.action_toggle_visibility);
+        visibilityBtn = (ImageButton) findViewById(R.id.action_toggle_visibility);
 
         floatingBtn.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                pickBtn.setClickable(false);
-                nsfwBtn.setClickable(false);
-                visibilityBtn.setClickable(false);
-                floatingBtn.setEnabled(false);
+                disableButtons();
 
                 postProgress.setVisibility(View.VISIBLE);
                 sendStatus();
@@ -568,6 +566,20 @@ public class  ComposeActivity extends BaseActivity implements ComposeOptionsFrag
         }
     }
 
+    private void disableButtons() {
+        pickBtn.setClickable(false);
+        nsfwBtn.setClickable(false);
+        visibilityBtn.setClickable(false);
+        floatingBtn.setEnabled(false);
+    }
+
+    private void enableButtons() {
+        pickBtn.setClickable(true);
+        nsfwBtn.setClickable(true);
+        visibilityBtn.setClickable(true);
+        floatingBtn.setEnabled(true);
+    }
+
     private void setStatusVisibility(String visibility) {
         statusVisibility = visibility;
         switch (visibility) {
@@ -825,6 +837,7 @@ public class  ComposeActivity extends BaseActivity implements ComposeOptionsFrag
         postProgress.setVisibility(View.INVISIBLE);
         textEditor.setError(getString(R.string.error_generic));
         statusAlreadyInFlight = false;
+        enableButtons();
     }
 
     private void readyStatus(final String content, final String visibility, final boolean sensitive,