diff --git a/CHANGES.md b/CHANGES.md
index f645840ea..79cd26640 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -7,6 +7,7 @@
 - Don't show duplicate notification messages
 - New config setting [show_images_inline](https://conversejs.org/docs/html/configuration.html#show-images-inline)
 - #537 Render `xmpp:` URI as link
+- #1058 Send an inactive chat state notification when the user switches to another tab 
 - #1062 Collapse multiple join/leave messages into one
 - #1063 URLs in the topic / subject are not clickable
 - #1140 Add support for destroyed chatrooms
diff --git a/dist/converse.js b/dist/converse.js
index 12dbc929d..66bce8a0a 100644
--- a/dist/converse.js
+++ b/dist/converse.js
@@ -61157,7 +61157,11 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
 
       function onWindowStateChanged(data) {
         if (_converse.chatboxviews) {
-          _converse.chatboxviews.each(view => view.onWindowStateChanged(data.state));
+          _converse.chatboxviews.each(view => {
+            if (view.model.get('id') !== 'controlbox') {
+              view.onWindowStateChanged(data.state);
+            }
+          });
         }
       }
 
@@ -62382,8 +62386,21 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
         },
 
         onWindowStateChanged(state) {
-          if (this.model.get('num_unread', 0) && !this.model.isHidden()) {
-            this.model.clearUnreadMsgCounter();
+          if (state === 'visible') {
+            if (!this.model.isHidden()) {
+              this.setChatState(_converse.ACTIVE);
+
+              if (this.model.get('num_unread', 0)) {
+                this.model.clearUnreadMsgCounter();
+              }
+            }
+          } else if (state === 'hidden') {
+            this.setChatState(_converse.INACTIVE, {
+              'silent': true
+            });
+            this.model.sendChatState();
+
+            _converse.connection.flush();
           }
         }
 
diff --git a/src/converse-chatview.js b/src/converse-chatview.js
index 8821b3fc0..d78e9e706 100644
--- a/src/converse-chatview.js
+++ b/src/converse-chatview.js
@@ -91,7 +91,11 @@
 
             function onWindowStateChanged (data) {
                 if (_converse.chatboxviews) {
-                    _converse.chatboxviews.each(view => view.onWindowStateChanged(data.state));
+                    _converse.chatboxviews.each(view => {
+                        if (view.model.get('id') !== 'controlbox') {
+                            view.onWindowStateChanged(data.state);
+                        }
+                    });
                 }
             }
             _converse.api.listen.on('windowStateChanged', onWindowStateChanged);
@@ -1266,8 +1270,17 @@
                 },
 
                 onWindowStateChanged (state) {
-                    if (this.model.get('num_unread', 0) && !this.model.isHidden()) {
-                        this.model.clearUnreadMsgCounter();
+                    if (state === 'visible') {
+                        if (!this.model.isHidden()) {
+                            this.setChatState(_converse.ACTIVE);
+                            if (this.model.get('num_unread', 0)) {
+                                this.model.clearUnreadMsgCounter();
+                            }
+                        }
+                    } else if (state === 'hidden') {
+                        this.setChatState(_converse.INACTIVE, {'silent': true});
+                        this.model.sendChatState();
+                        _converse.connection.flush();
                     }
                 }
             });
diff --git a/src/converse-singleton.js b/src/converse-singleton.js
index d02950d7b..2d3cd9448 100644
--- a/src/converse-singleton.js
+++ b/src/converse-singleton.js
@@ -55,8 +55,8 @@
                     }
                     if (_converse.isSingleton()) {
                         const any_chats_visible = _converse.chatboxes
-                            .filter((cb) => cb.get('id') != 'controlbox')
-                            .filter((cb) => !cb.get('hidden')).length > 0;
+                            .filter(cb => cb.get('id') != 'controlbox')
+                            .filter(cb => !cb.get('hidden')).length > 0;
 
                         if (any_chats_visible) {
                             return !chatbox.get('hidden');