diff --git a/openlp/core/ui/filerenameform.py b/openlp/core/ui/filerenameform.py
index 885824c38..a53695426 100644
--- a/openlp/core/ui/filerenameform.py
+++ b/openlp/core/ui/filerenameform.py
@@ -45,9 +45,7 @@ class FileRenameForm(QtGui.QDialog, Ui_FileRenameDialog):
         """
         Constructor
         """
-        super().__init__()
-        # TODO: python3 - parent correct?
-        #QtGui.QDialog.__init__(self, self.main_window)
+        super(FileRenameForm, self).__init__(Registry().get(u'main_window'))
         self.setupUi(self)
 
     def exec_(self, copy=False):
@@ -61,12 +59,12 @@ class FileRenameForm(QtGui.QDialog, Ui_FileRenameDialog):
         self.file_name_edit.setFocus()
         return QtGui.QDialog.exec_(self)
 
-    def _get_main_window(self):
-        """
-        Adds the main window to the class dynamically
-        """
-        if not hasattr(self, u'_main_window'):
-            self._main_window = Registry().get(u'main_window')
-        return self._main_window
-
-    main_window = property(_get_main_window)
+#    def _get_main_window(self):
+#        """
+#        Adds the main window to the class dynamically
+#        """
+#        if not hasattr(self, u'_main_window'):
+#            self._main_window = Registry().get(u'main_window')
+#        return self._main_window
+#
+#    main_window = property(_get_main_window)
diff --git a/openlp/core/ui/serviceitemeditform.py b/openlp/core/ui/serviceitemeditform.py
index d88dd8c12..6ca1068cc 100644
--- a/openlp/core/ui/serviceitemeditform.py
+++ b/openlp/core/ui/serviceitemeditform.py
@@ -44,9 +44,7 @@ class ServiceItemEditForm(QtGui.QDialog, Ui_ServiceItemEditDialog):
         Constructor
 
         """
-        super().__init__()
-        # TODO: python3 - parent correct?
-        #QtGui.QDialog.__init__(self, self.main_window)
+        super(ServiceItemEditForm, self).__init__(Registry().get(u'main_window'))
         self.setupUi(self)
         self.item_list = []
         self.list_widget.currentRowChanged.connect(self.on_current_row_changed)
diff --git a/openlp/core/ui/servicenoteform.py b/openlp/core/ui/servicenoteform.py
index cd265cb3a..308d9edcf 100644
--- a/openlp/core/ui/servicenoteform.py
+++ b/openlp/core/ui/servicenoteform.py
@@ -43,9 +43,7 @@ class ServiceNoteForm(QtGui.QDialog):
         """
         Constructor
         """
-        super().__init__()
-        # TODO: python3 - parent correct?
-        #QtGui.QDialog.__init__(self, self.main_window)
+        super(ServiceNoteForm, self).__init__(Registry().get(u'main_window'))
         self.setupUi()
         self.retranslateUi()
 
diff --git a/openlp/core/ui/starttimeform.py b/openlp/core/ui/starttimeform.py
index f2ac090d0..bf952a2d1 100644
--- a/openlp/core/ui/starttimeform.py
+++ b/openlp/core/ui/starttimeform.py
@@ -45,9 +45,7 @@ class StartTimeForm(QtGui.QDialog, Ui_StartTimeDialog):
         """
         Constructor
         """
-        super().__init__()
-        # TODO: python3 - parent correct?
-        #QtGui.QDialog.__init__(self, self.main_window)
+        super(StartTimeForm, self).__init__(Registry().get(u'main_window'))
         self.setupUi(self)
 
     def exec_(self):