diff --git a/src/gui/formmain.cpp b/src/gui/formmain.cpp
index 3f10478b0..a6c03eb8b 100755
--- a/src/gui/formmain.cpp
+++ b/src/gui/formmain.cpp
@@ -248,6 +248,7 @@ void FormMain::onAboutToQuit() {
 
     // We locked the lock to exit peacefully, unlock it to avoid warnings.
     SystemFactory::instance()->applicationCloseLock()->unlock();
+    QtSingleApplication::instance()->unlock();
   }
   else {
     // Request for write lock timed-out. This means
diff --git a/src/qtsingleapplication/qtlocalpeer.h b/src/qtsingleapplication/qtlocalpeer.h
index 39880f91b..46faef856 100644
--- a/src/qtsingleapplication/qtlocalpeer.h
+++ b/src/qtsingleapplication/qtlocalpeer.h
@@ -62,7 +62,9 @@ public:
 
     // Unlocks the file.
     bool unlock() {
-      return lockFile.unlock();
+      bool unlocked = lockFile.unlock();
+      lockFile.remove();
+      return unlocked;
     }
 
   Q_SIGNALS: