diff --git a/src/common/config.py b/src/common/config.py
index 1e3e96a50..d5cfd34ea 100644
--- a/src/common/config.py
+++ b/src/common/config.py
@@ -203,6 +203,7 @@ class Config:
 		'chat_merge_consecutive_nickname': [opt_bool, False, _('Merge consecutive nickname in chat window')],
 		'chat_merge_consecutive_nickname_indent': [opt_str, '  ', _('Indentation when using merge consecutive nickame')],
 		'gc_nicknames_colors': [ opt_str, '#a34526:#c000ff:#0012ff:#388a99:#38995d:#519938:#ff8a00:#94452d:#244b5a:#32645a', _('List of colors that will be used to color nicknames in groupchats'), True ],
+		'ctrl_tab_go_to_next_composing': [opt_bool, True, _('Ctrl-Tab go to next composing tab when none is unread')],
 	}
 
 	__options_per_key = {
diff --git a/src/message_window.py b/src/message_window.py
index d1aa2c6d5..61cf4b713 100644
--- a/src/message_window.py
+++ b/src/message_window.py
@@ -435,7 +435,7 @@ class MessageWindow:
 			if ctrl.nb_unread > 0:
 				found = True
 				break # found
-			else: # Search for a composing contact
+			elif gajim.config.get('ctrl_tab_go_to_next_composing') : # Search for a composing contact
 				contact = ctrl.contact
 				if first_composing_ind == -1 and contact.chatstate == 'composing':
 				# If no composing contact found yet, check if this one is composing