diff --git a/src/lib/gui/core/CoreProcess.cpp b/src/lib/gui/core/CoreProcess.cpp
index 9fa8b3fe7..336851fd3 100644
--- a/src/lib/gui/core/CoreProcess.cpp
+++ b/src/lib/gui/core/CoreProcess.cpp
@@ -517,9 +517,9 @@ void CoreProcess::checkOSXNotification(const QString &line)
 }
 #endif
 
-QString CoreProcess::correctedAddress() const
+QString CoreProcess::correctedAddress(const QString &address) const
 {
-  return wrapIpv6(m_address);
+  return wrapIpv6(address.simplified());
 }
 
 QString CoreProcess::requestDaemonLogPath()
diff --git a/src/lib/gui/core/CoreProcess.h b/src/lib/gui/core/CoreProcess.h
index d456ceeba..0e652e859 100644
--- a/src/lib/gui/core/CoreProcess.h
+++ b/src/lib/gui/core/CoreProcess.h
@@ -88,7 +88,7 @@ public:
   // setters
   void setAddress(const QString &address)
   {
-    m_address = address.trimmed();
+    m_address = correctedAddress(address);
   }
   void setMode(Settings::CoreMode mode)
   {
@@ -120,7 +120,7 @@ private:
   void checkLogLine(const QString &line);
   bool checkSecureSocket(const QString &line);
   void handleLogLines(const QString &text);
-  QString correctedAddress() const;
+  QString correctedAddress(const QString &address) const;
   QString requestDaemonLogPath();
   static QString makeQuotedArgs(const QString &app, const QStringList &args);
   static QString processModeToString(const Settings::ProcessMode mode);