diff --git a/CHANGELOG.md b/CHANGELOG.md
index 148c2151e..86424a62c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@
 - Bugfix: Fixed message input showing as red after removing a message that was more than 500 characters. (#4204)
 - Bugfix: Fixed unnecessary saving of windows layout. (#4201)
 - Bugfix: Fixed Reply window missing selection clear behaviour between chat and input box. (#4218)
+- Bugfix: Fixed crash that could occur when changing Tab layout and utilizing multiple windows. (#4248)
 - Dev: Ignore `WM_SHOWWINDOW` hide events, causing fewer attempted rescales. (#4198)
 
 ## 2.4.0
diff --git a/src/widgets/Window.cpp b/src/widgets/Window.cpp
index 818d0311d..fa3cb6f52 100644
--- a/src/widgets/Window.cpp
+++ b/src/widgets/Window.cpp
@@ -80,9 +80,11 @@ Window::Window(WindowType type, QWidget *parent)
                                        });
     if (type == WindowType::Main || type == WindowType::Popup)
     {
-        getSettings()->tabDirection.connect([this](int val) {
-            this->notebook_->setTabLocation(NotebookTabLocation(val));
-        });
+        getSettings()->tabDirection.connect(
+            [this](int val) {
+                this->notebook_->setTabLocation(NotebookTabLocation(val));
+            },
+            this->signalHolder_);
     }
 }