diff --git a/src/blackgui/dockwidget.cpp b/src/blackgui/dockwidget.cpp
index 9cf621cdf..23d4d320c 100644
--- a/src/blackgui/dockwidget.cpp
+++ b/src/blackgui/dockwidget.cpp
@@ -394,8 +394,8 @@ namespace BlackGui
 
     QString CDockWidget::windowTitleOrBackup() const
     {
-        QString t(windowTitle());
-        if (t.isEmpty()) { return windowTitleBackup(); }
+        const QString t(windowTitle());
+        if (t.isEmpty()) { return this->windowTitleBackup(); }
         return t;
     }
 
diff --git a/src/blackgui/dockwidget.h b/src/blackgui/dockwidget.h
index 7f81d60a7..93fbe90de 100644
--- a/src/blackgui/dockwidget.h
+++ b/src/blackgui/dockwidget.h
@@ -99,13 +99,6 @@ namespace BlackGui
         //! \copydoc CEnableForFramelessWindow::setFrameless
         virtual void setFrameless(bool frameless) override;
 
-        //! Value for dynamic property "dockwidget"
-        static const QString &propertyOuterWidget();
-
-        //! Value for dynamic property "dockwidget"
-        static const QString &propertyInnerWidget();
-
-    public slots:
         //! Toggle floating
         void toggleFloating();
 
@@ -136,6 +129,12 @@ namespace BlackGui
         //! Display status messages
         void displayStatusMessages(const BlackMisc::CStatusMessageList &statusMessages);
 
+        //! Value for dynamic property "dockwidget"
+        static const QString &propertyOuterWidget();
+
+        //! Value for dynamic property "dockwidget"
+        static const QString &propertyInnerWidget();
+
     signals:
         //! Top level has changed for given widget
         void widgetTopLevelChanged(CDockWidget *, bool topLevel);
@@ -214,17 +213,17 @@ namespace BlackGui
         QWidgetAction *m_marginMenuAction  = nullptr; //!< menu widget(!) action for margin widget
         Components::CMarginsInput *m_input = nullptr; //!< margins widget
         Menus::CFontMenu *m_fontMenu       = nullptr; //!< Font menu
+        bool m_allowStatusBar              = true;
+        bool m_windowTitleWhenDocked       = true;
+        bool m_wasAlreadyFloating          = false;   //!< flag if widget was at least once in floating state
+        bool m_selected                    = false;   //!< selected when tabbed
+        bool m_dockWidgetVisible           = false;   //!< logical visible, not to be confused with QDockWidget::isVisible()
+        bool m_wasFrameless                = false;   //!< frameless when last floating
         CManagedStatusBar m_statusBar;                //!< status bar when floating
         QString m_windowTitleBackup;                  //!< original title, even if the widget title is deleted for layout purposes
         QSize m_preferredSizeWhenFloating;            //!< preferred size when floating 1st time
         QSize m_initialDockedMinimumSize;             //!< minimum size before first floating
         QPoint m_offsetWhenFloating;                  //!< initial offset to main window when floating first time
-        bool m_allowStatusBar        = true;
-        bool m_windowTitleWhenDocked = true;
-        bool m_wasAlreadyFloating    = false;         //!< flag if widget was at least once in floating state
-        bool m_selected              = false;         //!< selected when tabbed
-        bool m_dockWidgetVisible     = false;         //!< logical visible, not to be confused with QDockWidget::isVisible()
-        bool m_wasFrameless          = false;         //!< frameless when last floating
         BlackMisc::CSetting<BlackGui::Settings::TDockWidget> m_settings { this, &CDockWidget::settingsChanged };
 
         //! Top level has been chaged