diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index c16b80ec62..eb75df88ba 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1046,7 +1046,7 @@ module.exports = React.createClass({
             if (MatrixClientPeg.get().isGuest()) {
                 topBar = <GuestWarningBar />;
             }
-            else if (Notifier.supportsDesktopNotifications() && !Notifier.isEnabled() && !Notifier.isToolbarHidden()) {
+            else if (Notifier.supportsDesktopNotifications() && Notifier.shouldShowToolbar()) {
                 topBar = <MatrixToolbar />;
             }
             else if (this.state.hasNewVersion) {