diff --git a/openlp/core/ui/generaltab.py b/openlp/core/ui/generaltab.py
index da10f66e2..670001ee7 100644
--- a/openlp/core/ui/generaltab.py
+++ b/openlp/core/ui/generaltab.py
@@ -124,11 +124,11 @@ class GeneralTab(SettingsTab):
         QtCore.QObject.connect(self.AutoOpenCheckBox,
             QtCore.SIGNAL(u'stateChanged(int)'), self.onAutoOpenCheckBoxChanged)
         QtCore.QObject.connect(self.NumberEdit,
-            QtCore.SIGNAL(u'lostFocus()'), self.onNumberEditLostFocus)
+            QtCore.SIGNAL(u'editingFinished()'), self.onNumberEditLostFocus)
         QtCore.QObject.connect(self.UsernameEdit,
-            QtCore.SIGNAL(u'lostFocus()'), self.onUsernameEditLostFocus)
+            QtCore.SIGNAL(u'editingFinished()'), self.onUsernameEditLostFocus)
         QtCore.QObject.connect(self.PasswordEdit,
-            QtCore.SIGNAL(u'lostFocus()'), self.onPasswordEditLostFocus)
+            QtCore.SIGNAL(u'editingFinished()'), self.onPasswordEditLostFocus)
 
     def retranslateUi(self):
         self.MonitorGroupBox.setTitle(translate(u'GeneralTab', u'Monitors'))
diff --git a/openlp/plugins/songs/forms/editsongform.py b/openlp/plugins/songs/forms/editsongform.py
index 7891d508d..cf5e0b963 100644
--- a/openlp/plugins/songs/forms/editsongform.py
+++ b/openlp/plugins/songs/forms/editsongform.py
@@ -78,7 +78,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
         QtCore.QObject.connect(self.MaintenanceButton,
             QtCore.SIGNAL(u'clicked()'), self.onMaintenanceButtonClicked)
         QtCore.QObject.connect(self.TitleEditItem,
-            QtCore.SIGNAL(u'lostFocus()'), self.onTitleEditItemLostFocus)
+            QtCore.SIGNAL(u'editingFinished()'), self.onTitleEditItemLostFocus)
         QtCore.QObject.connect(self.CCLNumberEdit,
             QtCore.SIGNAL(u'lostFocus()'), self.onCCLNumberEditLostFocus)
         QtCore.QObject.connect(Receiver.get_receiver(),