diff --git a/src/message_window.py b/src/message_window.py
index 8df424f34..ed3200e77 100644
--- a/src/message_window.py
+++ b/src/message_window.py
@@ -368,6 +368,10 @@ class MessageWindow(object):
                 # theme
                 if not Gtk.Settings.get_default().get_property(
                 'gtk-key-theme-name') == 'Emacs':
+                    if gajim.interface.msg_win_mgr.mode == \
+                    gajim.interface.msg_win_mgr.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER:
+                        gajim.interface.roster.tree.grab_focus()
+                        return False
                     control._on_send_file_menuitem_activate(None)
                     return True
             elif control.type_id == message_control.TYPE_CHAT and \