diff --git a/src/message_window.py b/src/message_window.py
index ceaf7ccc3e34359a9d1d44b0276f35006a34d165..37eb67b5ae31821ed55495fc348b76166f559309 100644
--- a/src/message_window.py
+++ b/src/message_window.py
@@ -355,7 +355,11 @@ class MessageWindow(object):
                 control._on_history_menuitem_activate()
             elif control.type_id == message_control.TYPE_CHAT and \
             keyval == gtk.keysyms.f: # CTRL + f
-                control._on_send_file_menuitem_activate(None)
+                # CTRL + f moves cursor one char forward when user uses Emacs
+                # theme
+                if not gtk.settings_get_default().get_property(
+                'gtk-key-theme-name') == 'Emacs':
+                    control._on_send_file_menuitem_activate(None)
             elif control.type_id == message_control.TYPE_CHAT and \
             keyval == gtk.keysyms.g: # CTRL + g
                 control._on_convert_to_gc_menuitem_activate(None)