diff --git a/src/roster_window.py b/src/roster_window.py
index 6fc352e81c8730fdf861c1c2e107555c8196393a..a92d3a4c7e94a6a17f9b5c8ed3333b7a183ba08a 100644
--- a/src/roster_window.py
+++ b/src/roster_window.py
@@ -2749,8 +2749,8 @@ class RosterWindow:
 			if gajim.config.get_per('defaultstatusmsg', show, 'enabled'):
 				return gajim.config.get_per('defaultstatusmsg', show, 'message')
 		if (show == 'online' and not gajim.config.get('ask_online_status')) or \
-			(show == 'offline' and not gajim.config.get('ask_offline_status')) or \
-			show == 'invisible':
+		(show in ('offline', 'invisible') 
+		and not gajim.config.get('ask_offline_status')):
 			return ''
 		dlg = dialogs.ChangeStatusMessageDialog(show)
 		dlg.window.present() # show it on current workspace