diff --git a/interface/src/ui/AddressBarDialog.cpp b/interface/src/ui/AddressBarDialog.cpp
index 4d2094ac51..5d27af444a 100644
--- a/interface/src/ui/AddressBarDialog.cpp
+++ b/interface/src/ui/AddressBarDialog.cpp
@@ -34,8 +34,8 @@ AddressBarDialog::AddressBarDialog(QQuickItem* parent) : OffscreenQmlDialog(pare
             emit forwardEnabledChanged();
         }
     });
-    _backEnabled = DependencyManager::get<AddressManager>()->getBackState();
-    _forwardEnabled = DependencyManager::get<AddressManager>()->getForwardState();
+    _backEnabled = !(DependencyManager::get<AddressManager>()->getBackStack().isEmpty());
+    _forwardEnabled = !(DependencyManager::get<AddressManager>()->getForwardStack().isEmpty());
 }
 
 void AddressBarDialog::hide() {
diff --git a/libraries/networking/src/AddressManager.h b/libraries/networking/src/AddressManager.h
index 2e506ffed6..6d9ff01be2 100644
--- a/libraries/networking/src/AddressManager.h
+++ b/libraries/networking/src/AddressManager.h
@@ -62,8 +62,8 @@ public:
 
     void loadSettings(const QString& lookupString = QString());
 
-    bool getBackState() { return (!_backStack.isEmpty()); }
-    bool getForwardState() { return (!_forwardStack.isEmpty()); }
+    const QStack<QUrl>& getBackStack() const { return _backStack; }
+    const QStack<QUrl>& getForwardStack() const { return _forwardStack; }
 
 public slots:
     void handleLookupString(const QString& lookupString);