diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index 4201a31fc7..1399388a60 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -749,6 +749,8 @@ void Menu::saveSettings(QSettings* settings) {
 
     scanMenuBar(&saveAction, settings);
     Application::getInstance()->getAvatar()->saveData(settings);
+    
+    DependencyManager::get<AddressManager>()->storeCurrentAddress();
 
     if (lockedSettings) {
         Application::getInstance()->unlockSettings();
diff --git a/libraries/networking/src/AddressManager.h b/libraries/networking/src/AddressManager.h
index 370fd0e07d..dee070740f 100644
--- a/libraries/networking/src/AddressManager.h
+++ b/libraries/networking/src/AddressManager.h
@@ -58,6 +58,8 @@ public slots:
     void goToUser(const QString& username);
     void goToAddressFromObject(const QVariantMap& addressMap);
     
+    void storeCurrentAddress();
+    
 signals:
     void lookupResultsFinished();
     void lookupResultIsOffline();
@@ -72,7 +74,6 @@ protected:
 private slots:
     void handleAPIResponse(QNetworkReply& requestReply);
     void handleAPIError(QNetworkReply& errorReply);
-    void storeCurrentAddress();
 private:
     void setDomainInfo(const QString& hostname, quint16 port, const QString& domainName = QString());