diff --git a/deluge/ui/gtkui/glade/main_window.glade b/deluge/ui/gtkui/glade/main_window.glade
index 8fb2302e4..3ad32b7f6 100644
--- a/deluge/ui/gtkui/glade/main_window.glade
+++ b/deluge/ui/gtkui/glade/main_window.glade
@@ -37,7 +37,7 @@
                         <property name="use_underline">True</property>
                         <property name="use_stock">False</property>
                         <signal name="activate" handler="on_menuitem_addtorrent_activate"/>
-                        <accelerator key="O" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+                        <accelerator key="O" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                         <child internal-child="image">
                           <widget class="GtkImage" id="image1">
                             <property name="visible">True</property>
@@ -57,7 +57,7 @@
                         <property name="use_underline">True</property>
                         <property name="use_stock">False</property>
                         <signal name="activate" handler="on_menuitem_createtorrent_activate"/>
-                        <accelerator key="N" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+                        <accelerator key="N" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                         <child internal-child="image">
                           <widget class="GtkImage" id="image2">
                             <property name="visible">True</property>
@@ -82,7 +82,7 @@
                         <property name="use_underline">True</property>
                         <property name="use_stock">False</property>
                         <signal name="activate" handler="on_menuitem_quitdaemon_activate"/>
-                        <accelerator key="Q" modifiers="GDK_SHIFT_MASK|GDK_CONTROL_MASK" signal="activate"/>
+                        <accelerator key="Q" signal="activate" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK"/>
                         <child internal-child="image">
                           <widget class="GtkImage" id="image3">
                             <property name="visible">True</property>
@@ -134,7 +134,7 @@
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <signal name="activate" handler="on_menuitem_preferences_activate"/>
-                        <accelerator key="P" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+                        <accelerator key="P" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                       </widget>
                     </child>
                     <child>
@@ -147,7 +147,7 @@
                         <property name="use_underline">True</property>
                         <property name="use_stock">False</property>
                         <signal name="activate" handler="on_menuitem_connectionmanager_activate"/>
-                        <accelerator key="M" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+                        <accelerator key="M" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                         <child internal-child="image">
                           <widget class="GtkImage" id="image4">
                             <property name="visible">True</property>
@@ -2826,6 +2826,7 @@
                                             <property name="action">select-folder</property>
                                             <property name="local_only">False</property>
                                             <property name="title" translatable="yes">Select A Folder</property>
+                                            <signal name="file_set" handler="on_move_completed_file_set"/>
                                           </widget>
                                           <packing>
                                             <property name="expand">False</property>
@@ -2916,6 +2917,7 @@
                                         <property name="tooltip" translatable="yes">If checked this torrent won't be shared among trackers, DHT nodes, etc...</property>
                                         <property name="use_action_appearance">False</property>
                                         <property name="draw_indicator">True</property>
+                                        <signal name="toggled" handler="on_chk_toggled"/>
                                       </widget>
                                       <packing>
                                         <property name="expand">False</property>
@@ -2931,6 +2933,7 @@
                                         <property name="receives_default">False</property>
                                         <property name="use_action_appearance">False</property>
                                         <property name="draw_indicator">True</property>
+                                        <signal name="toggled" handler="on_chk_toggled"/>
                                       </widget>
                                       <packing>
                                         <property name="expand">False</property>
@@ -2953,7 +2956,7 @@ distribution negatively in the swarm. It should be
 used sparingly.</property>
                                         <property name="use_action_appearance">False</property>
                                         <property name="draw_indicator">True</property>
-                                        <signal name="toggled" handler="on_chk_sequential_download_toggled"/>
+                                        <signal name="toggled" handler="on_chk_toggled"/>
                                       </widget>
                                       <packing>
                                         <property name="expand">True</property>
@@ -2970,7 +2973,7 @@ used sparingly.</property>
                                         <property name="tooltip" translatable="yes">Torrent is shared between other Deluge users or not.</property>
                                         <property name="use_action_appearance">False</property>
                                         <property name="draw_indicator">True</property>
-                                        <signal name="toggled" handler="on_chk_shared_toggled"/>
+                                        <signal name="toggled" handler="on_chk_toggled"/>
                                       </widget>
                                       <packing>
                                         <property name="expand">True</property>
diff --git a/deluge/ui/gtkui/options_tab.py b/deluge/ui/gtkui/options_tab.py
index 7d61870cf..4360ec76a 100644
--- a/deluge/ui/gtkui/options_tab.py
+++ b/deluge/ui/gtkui/options_tab.py
@@ -72,10 +72,9 @@ class OptionsTab(Tab):
             "on_button_edit_trackers_clicked": self._on_button_edit_trackers_clicked,
             "on_chk_move_completed_toggled": self._on_chk_move_completed_toggled,
             "on_chk_stop_at_ratio_toggled": self._on_chk_stop_at_ratio_toggled,
-            "on_chk_shared_toggled": self._on_chk_shared_toggled,
+            "on_chk_toggled": self._on_chk_toggled,
             "on_spin_value_changed": self._on_spin_value_changed,
-            "on_chk_sequential_download_toggled": \
-                                        self._on_chk_sequential_download_toggled
+            "on_move_completed_file_set": self._on_move_completed_file_set
         })
 
     def start(self):
@@ -85,6 +84,9 @@ class OptionsTab(Tab):
         else:
             self.filechooser_move_completed.hide()
             self.entry_move_completed.show()
+            self.entry_move_completed.connect(
+                "changed", self._on_entry_move_completed_changed
+            )
 
     def stop(self):
         pass
@@ -278,7 +280,7 @@ class OptionsTab(Tab):
         if not self.button_apply.is_sensitive():
             self.button_apply.set_sensitive(True)
 
-    def _on_chk_shared_toggled(self, widget):
+    def _on_chk_toggled(self, widget):
         if not self.button_apply.is_sensitive():
             self.button_apply.set_sensitive(True)
 
@@ -286,6 +288,10 @@ class OptionsTab(Tab):
         if not self.button_apply.is_sensitive():
             self.button_apply.set_sensitive(True)
 
-    def _on_chk_sequential_download_toggled(self, widget):
+    def _on_move_completed_file_set(self, widget):
+        if not self.button_apply.is_sensitive():
+            self.button_apply.set_sensitive(True)
+
+    def _on_entry_move_completed_changed(self, widget):
         if not self.button_apply.is_sensitive():
             self.button_apply.set_sensitive(True)