diff --git a/res/css/views/context_menus/_StatusMessageContextMenu.scss b/res/css/views/context_menus/_StatusMessageContextMenu.scss
index 465f1b53e4..873ad99495 100644
--- a/res/css/views/context_menus/_StatusMessageContextMenu.scss
+++ b/res/css/views/context_menus/_StatusMessageContextMenu.scss
@@ -28,6 +28,10 @@ limitations under the License.
     display: inline-block;
 }
 
+.mx_StatusMessageContextMenu_submitFaded {
+    opacity: 0.5;
+}
+
 .mx_StatusMessageContextMenu_submit img {
     vertical-align: middle;
     margin-left: 8px;
diff --git a/src/components/views/context_menus/StatusMessageContextMenu.js b/src/components/views/context_menus/StatusMessageContextMenu.js
index 5f137a12a5..243164301d 100644
--- a/src/components/views/context_menus/StatusMessageContextMenu.js
+++ b/src/components/views/context_menus/StatusMessageContextMenu.js
@@ -48,11 +48,16 @@ export default class StatusMessageContextMenu extends React.Component {
     }
 
     render() {
+        const formSubmitClasses = classNames({
+            "mx_StatusMessageContextMenu_submit": true,
+            "mx_StatusMessageContextMenu_submitFaded": !this.state.message, // no message == faded
+        });
+
         const form = <form className="mx_StatusMessageContextMenu_form" onSubmit={this._onSubmit} autoComplete="off">
             <input type="text" key="message" placeholder={_t("Set a new status...")} autoFocus={true}
                    className="mx_StatusMessageContextMenu_message"
                    value={this.state.message} onChange={this._onStatusChange} maxLength="60" />
-            <AccessibleButton onClick={this._onSubmit} element="div" className="mx_StatusMessageContextMenu_submit">
+            <AccessibleButton onClick={this._onSubmit} element="div" className={formSubmitClasses}>
                 <img src="img/icons-checkmark.svg" width="22" height="22" />
             </AccessibleButton>
         </form>;
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index e81ee82ca7..5c7e067f95 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1053,9 +1053,9 @@
     "Forget": "Forget",
     "Low Priority": "Low Priority",
     "Direct Chat": "Direct Chat",
-    "View Community": "View Community",
-    "Clear status": "Clear status",
     "Set a new status...": "Set a new status...",
+    "Clear status": "Clear status",
+    "View Community": "View Community",
     "Sorry, your browser is <b>not</b> able to run Riot.": "Sorry, your browser is <b>not</b> able to run Riot.",
     "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.",
     "Please install <chromeLink>Chrome</chromeLink> or <firefoxLink>Firefox</firefoxLink> for the best experience.": "Please install <chromeLink>Chrome</chromeLink> or <firefoxLink>Firefox</firefoxLink> for the best experience.",