diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0150f049..f07f7873 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,7 +11,7 @@
 - Minor: Popup overlay now only draws an outline when being interacted with. (#6140)
 - Minor: Made filters searchable in the Settings dialog search bar. (#5890)
 - Minor: Updated emojis to Unicode 16.0. (#6155)
-- Minor: Allow disabling of double-click tab renaming through setting. (#6163)
+- Minor: Allow disabling of double-click tab renaming through setting. (#6163, #6184)
 - Bugfix: Don't create native messaging manifest file if browser directory doesn't exist. (#6116)
 - Bugfix: Fixed scrolling now working on inputs in the settings. (#6128)
 - Bugfix: Make reply-cancel button less coarse-grained. (#6106)
diff --git a/src/widgets/settingspages/GeneralPage.cpp b/src/widgets/settingspages/GeneralPage.cpp
index 6b8b013d..ca6d92fa 100644
--- a/src/widgets/settingspages/GeneralPage.cpp
+++ b/src/widgets/settingspages/GeneralPage.cpp
@@ -1369,8 +1369,11 @@ void GeneralPage::initLayout(GeneralPageView &layout)
         "Enable experimental Twitch EventSub support (requires restart)",
         s.enableExperimentalEventSub);
 
-    layout.addCheckbox("Disable renaming of tabs on double-click",
-                       s.disableTabRenamingOnClick);
+    SettingWidget::checkbox("Disable renaming of tabs on double-click",
+                            s.disableTabRenamingOnClick)
+        ->setTooltip("Prevents the rename dialog from opening when a "
+                     "tab is double-clicked")
+        ->addTo(layout);
 
     layout.addStretch();