diff --git a/src/common/config.py b/src/common/config.py
index 41b231775..7e5b491d5 100644
--- a/src/common/config.py
+++ b/src/common/config.py
@@ -126,7 +126,6 @@ class Config:
 		'always_english_wiktionary': [opt_bool, False],
 		'use_dbus': [opt_bool, True, _('Allow controlling Gajim via D-Bus service.')],
 		'chat_state_notifications': [opt_str, 'all'], # 'all', 'composing_only', 'disabled'
-		'chat_state_send_inactive_on_focus_out': [opt_bool, True, _('Should Gajim send inactive ("is doing something else") on just focus out of window/switch to another tab?')],
 		'autodetect_browser_mailer': [opt_bool, True],
 		'print_ichat_every_foo_minutes': [opt_int, 5],
 		'confirm_close_muc': [opt_bool, True, _('Ask before closing a group chat tab/window.')],
diff --git a/src/tabbed_chat_window.py b/src/tabbed_chat_window.py
index 55d23d5aa..9bf83b30c 100644
--- a/src/tabbed_chat_window.py
+++ b/src/tabbed_chat_window.py
@@ -307,15 +307,6 @@ timestamp, contact):
 		if window_state is None:
 			return
 		
-		# focus-out is also emitted by showing context menu
-		# so check to see if we're really not paying attention to window/tab
-		# NOTE: if the user changes tab, switch-tab sends inactive to the tab
-		# we are leaving so we just send to active tab here
-		if self.popup_is_shown is False and gajim.config.get('chat_state_send_inactive_on_focus_out'):
-			# we are outside of the window
-			# so no context menu, so send 'inactive' to active tab
-			self.send_chatstate('inactive')
-		
 	def on_chat_notebook_key_press_event(self, widget, event):
 		chat.Chat.on_chat_notebook_key_press_event(self, widget, event)