diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index f5c87e1b96..9dc2a50d10 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -326,7 +326,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) :
         _dependencyManagerIsSetup(setupEssentials(argc, argv)),
         _window(new MainWindow(desktop())),
         _toolWindow(NULL),
-        _friendsWindow(NULL),
         _undoStackScriptingInterface(&_undoStack),
         _frameCount(0),
         _fps(60.0f),
@@ -4625,21 +4624,20 @@ void Application::activeChanged(Qt::ApplicationState state) {
     }
 }
 void Application::showFriendsWindow() {
+    const QString FRIENDS_WINDOW_OBJECT_NAME = "FriendsWindow";
     const QString FRIENDS_WINDOW_TITLE = "Add/Remove Friends";
     const QString FRIENDS_WINDOW_URL = "https://metaverse.highfidelity.com/user/friends";
     const int FRIENDS_WINDOW_WIDTH = 290;
     const int FRIENDS_WINDOW_HEIGHT = 500;
-    if (!_friendsWindow) {
-        _friendsWindow = new WebWindowClass(FRIENDS_WINDOW_TITLE, FRIENDS_WINDOW_URL, FRIENDS_WINDOW_WIDTH,
-            FRIENDS_WINDOW_HEIGHT, false);
-        connect(_friendsWindow, &WebWindowClass::closed, this, &Application::friendsWindowClosed);
+    auto webWindowClass = _window->findChildren<WebWindowClass>(FRIENDS_WINDOW_OBJECT_NAME);
+    if (webWindowClass.empty()) {
+        auto friendsWindow = new WebWindowClass(FRIENDS_WINDOW_TITLE, FRIENDS_WINDOW_URL, FRIENDS_WINDOW_WIDTH,
+                                                FRIENDS_WINDOW_HEIGHT, false);
+        friendsWindow->setParent(_window);
+        friendsWindow->setObjectName(FRIENDS_WINDOW_OBJECT_NAME);
+        connect(friendsWindow, &WebWindowClass::closed, &WebWindowClass::deleteLater);
+        friendsWindow->setVisible(true);
     }
-    _friendsWindow->setVisible(true);
-}
-
-void Application::friendsWindowClosed() {
-    delete _friendsWindow;
-    _friendsWindow = NULL;
 }
 
 void Application::postLambdaEvent(std::function<void()> f) {
diff --git a/interface/src/Application.h b/interface/src/Application.h
index 5ae8219b99..9bb19dd6b7 100644
--- a/interface/src/Application.h
+++ b/interface/src/Application.h
@@ -393,7 +393,6 @@ public slots:
     void saveScripts();
 
     void showFriendsWindow();
-    void friendsWindowClosed();
 
     void packageModel();
 
@@ -506,7 +505,6 @@ private:
     MainWindow* _window;
 
     ToolWindow* _toolWindow;
-    WebWindowClass* _friendsWindow;
 
     QUndoStack _undoStack;
     UndoStackScriptingInterface _undoStackScriptingInterface;