diff --git a/src/adhoc_commands.py b/src/adhoc_commands.py
index db21dfdb6..5add272fe 100644
--- a/src/adhoc_commands.py
+++ b/src/adhoc_commands.py
@@ -64,13 +64,12 @@ class CommandWindow:
         self.window.connect('delete-event',
             self.on_adhoc_commands_window_delete_event)
         for name in ('restart_button', 'back_button', 'forward_button',
-            'execute_button', 'finish_button', 'close_button',
-            'stages_notebook', 'retrieving_commands_stage_vbox',
-            'command_list_stage_vbox', 'command_list_vbox',
-            'sending_form_stage_vbox', 'sending_form_progressbar',
-            'notes_label', 'no_commands_stage_vbox', 'error_stage_vbox',
-            'error_description_label'):
-            self.__dict__[name] = self.xml.get_object(name)
+        'execute_button', 'finish_button', 'close_button', 'stages_notebook',
+        'retrieving_commands_stage_vbox', 'command_list_stage_vbox',
+        'command_list_vbox', 'sending_form_stage_vbox',
+        'sending_form_progressbar', 'notes_label', 'no_commands_stage_vbox',
+        'error_stage_vbox', 'error_description_label'):
+            setattr(self, name, self.xml.get_object(name))
 
         self.initiate()