diff --git a/deluge/ui/gtkui/addtorrentdialog.py b/deluge/ui/gtkui/addtorrentdialog.py
index 9bc4eb5c4..fceb882f9 100644
--- a/deluge/ui/gtkui/addtorrentdialog.py
+++ b/deluge/ui/gtkui/addtorrentdialog.py
@@ -399,7 +399,6 @@ class AddTorrentDialog(component.Component):
             options["prioritize_first_last_pieces"])
         self.glade.get_widget("chk_move_completed").set_active(
             options["move_completed"])
-        self._on_chk_move_completed_toggled(self.glade.get_widget("chk_move_completed"))
 
     def save_torrent_options(self, row=None):
         # Keeps the torrent options dictionary up-to-date with what the user has
@@ -504,7 +503,6 @@ class AddTorrentDialog(component.Component):
             self.core_config["prioritize_first_last_pieces"])
         self.glade.get_widget("chk_move_completed").set_active(
             self.core_config["move_completed"])
-        self._on_chk_move_completed_toggled(self.glade.get_widget("chk_move_completed"))
 
     def get_file_priorities(self, torrent_id):
         # A list of priorities
diff --git a/deluge/ui/gtkui/glade/add_torrent_dialog.glade b/deluge/ui/gtkui/glade/add_torrent_dialog.glade
index fe6c48670..83023761b 100644
--- a/deluge/ui/gtkui/glade/add_torrent_dialog.glade
+++ b/deluge/ui/gtkui/glade/add_torrent_dialog.glade
@@ -436,9 +436,10 @@
                                 </child>
                                 <child>
                                   <widget class="GtkFileChooserButton" id="button_move_completed_location">
+                                    <property name="sensitive">False</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="show_hidden">True</property>
                                     <property name="action">select-folder</property>
+                                    <property name="show_hidden">True</property>
                                     <property name="title" translatable="yes">Select A Folder</property>
                                   </widget>
                                   <packing>
@@ -447,6 +448,7 @@
                                 </child>
                                 <child>
                                   <widget class="GtkEntry" id="entry_move_completed_path">
+                                    <property name="sensitive">False</property>
                                     <property name="can_focus">True</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                     <property name="invisible_char">&#x25CF;</property>