diff --git a/src/app/main.cpp b/src/app/main.cpp
index a5c9606c87b..3a24d1f6087 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -497,8 +497,7 @@ int main(int argc, char **argv)
         errorOverview.exec();
     }
 
-    // Set up lock and remote arguments.
-    app.initialize();
+    // Set up remote arguments.
     QObject::connect(&app, SIGNAL(messageReceived(QString,QObject*)),
                      &pluginManager, SLOT(remoteArguments(QString,QObject*)));
 
diff --git a/src/shared/qtsingleapplication/qtsingleapplication.cpp b/src/shared/qtsingleapplication/qtsingleapplication.cpp
index 87ca1308599..692dd844412 100644
--- a/src/shared/qtsingleapplication/qtsingleapplication.cpp
+++ b/src/shared/qtsingleapplication/qtsingleapplication.cpp
@@ -93,6 +93,10 @@ QtSingleApplication::QtSingleApplication(const QString &appId, int &argc, char *
     // Add current pid to list and terminate it
     *pids++ = QCoreApplication::applicationPid();
     *pids = 0;
+    pidPeer = new QtLocalPeer(this, appId + QLatin1Char('-') +
+                              QString::number(QCoreApplication::applicationPid()));
+    connect(pidPeer, SIGNAL(messageReceived(QString,QObject*)), SIGNAL(messageReceived(QString,QObject*)));
+    pidPeer->isClient();
     lockfile.unlock();
 }
 
@@ -137,14 +141,6 @@ bool QtSingleApplication::isRunning(qint64 pid)
     return peer.isClient();
 }
 
-void QtSingleApplication::initialize(bool)
-{
-    pidPeer = new QtLocalPeer(this, appId + QLatin1Char('-') +
-                              QString::number(QCoreApplication::applicationPid()));
-    connect(pidPeer, SIGNAL(messageReceived(QString,QObject*)), SIGNAL(messageReceived(QString,QObject*)));
-    pidPeer->isClient();
-}
-
 bool QtSingleApplication::sendMessage(const QString &message, int timeout, qint64 pid)
 {
     if (pid == -1) {
diff --git a/src/shared/qtsingleapplication/qtsingleapplication.h b/src/shared/qtsingleapplication/qtsingleapplication.h
index a54d0812917..7ba2f1ea340 100644
--- a/src/shared/qtsingleapplication/qtsingleapplication.h
+++ b/src/shared/qtsingleapplication/qtsingleapplication.h
@@ -56,9 +56,6 @@ public Q_SLOTS:
     bool sendMessage(const QString &message, int timeout = 5000, qint64 pid = -1);
     void activateWindow();
 
-public:
-    void initialize(bool = true);
-
 Q_SIGNALS:
     void messageReceived(const QString &message, QObject *socket);
     void fileOpenRequest(const QString &file);