diff --git a/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java b/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
index 403b9b0a8..36330bcc1 100644
--- a/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
+++ b/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
@@ -348,8 +348,6 @@ public class  ComposeActivity extends BaseActivity implements ComposeOptionsFrag
         floatingBtn.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                disableButtons();
-
                 postProgress.setVisibility(View.VISIBLE);
                 sendStatus();
             }
@@ -637,9 +635,13 @@ public class  ComposeActivity extends BaseActivity implements ComposeOptionsFrag
         if (statusHideText) {
             spoilerText = contentWarningEditor.getText().toString();
         }
-        if (contentText.length() + spoilerText.length() <= STATUS_CHARACTER_LIMIT) {
+        int characterCount = contentText.length() + spoilerText.length();
+        if (characterCount > 0 && characterCount <= STATUS_CHARACTER_LIMIT) {
             statusAlreadyInFlight = true;
+            disableButtons();
             readyStatus(contentText, statusVisibility, statusMarkSensitive, spoilerText);
+        } else if (characterCount <= 0) {
+            textEditor.setError(getString(R.string.error_empty));
         } else {
             textEditor.setError(getString(R.string.error_compose_character_limit));
         }
@@ -873,6 +875,7 @@ public class  ComposeActivity extends BaseActivity implements ComposeOptionsFrag
                     protected void onCancelled() {
                         removeAllMediaFromQueue();
                         statusAlreadyInFlight = false;
+                        enableButtons();
                         super.onCancelled();
                     }
                 };
@@ -898,6 +901,7 @@ public class  ComposeActivity extends BaseActivity implements ComposeOptionsFrag
                     }
                 });
         statusAlreadyInFlight = false;
+        enableButtons();
     }
 
     private void onMediaPick() {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 42bb3fa7f..345d1c01c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,6 +1,7 @@
 <resources>
 
     <string name="error_generic">An error occurred.</string>
+    <string name="error_empty">This can\'t be empty.</string>
     <string name="error_invalid_domain">Invalid domain entered</string>
     <string name="error_failed_app_registration">Failed authenticating with that instance.</string>
     <string name="error_no_web_browser_found">Couldn\'t find a web browser to use.</string>