diff --git a/src/blackgui/guiutility.cpp b/src/blackgui/guiutility.cpp
index dfea51953..e6c9e007c 100644
--- a/src/blackgui/guiutility.cpp
+++ b/src/blackgui/guiutility.cpp
@@ -21,11 +21,17 @@ namespace BlackGui
         {
             CEnableForFramelessWindow *mw = dynamic_cast<CEnableForFramelessWindow *>(w);
             if (!mw) { continue; }
-            if (mw->isMainApplicationWindow()) return mw;
+            if (mw->isMainApplicationWindow()) { return mw; }
         }
         return nullptr;
     }
 
+    QWidget *CGuiUtility::mainApplicationWindowWidget()
+    {
+        CEnableForFramelessWindow *mw = mainApplicationWindow();
+        return mw ? mw->getWidget() : nullptr;
+    }
+
     bool CGuiUtility::isMainWindowFrameless()
     {
         CEnableForFramelessWindow *mw = mainApplicationWindow();
@@ -70,11 +76,11 @@ namespace BlackGui
 
     QString CGuiUtility::replaceTabCountValue(const QString &oldName, int count)
     {
-        const QString v = QString("(").append(QString::number(count)).append(")");
+        const QString v = QString(" (").append(QString::number(count)).append(")");
         if (oldName.isEmpty()) { return v; }
         int index = oldName.lastIndexOf('(');
         if (index == 0) { return v; }
-        if (index < 0) { return QString(oldName).append(" ").append(v); }
-        return QString(oldName.left(index)).append(" ").append(v);
+        if (index < 0) { return QString(oldName).trimmed().append(v); }
+        return QString(oldName.left(index)).trimmed().append(v);
     }
 }
diff --git a/src/blackgui/guiutility.h b/src/blackgui/guiutility.h
index 4a09d4691..88bf38dc2 100644
--- a/src/blackgui/guiutility.h
+++ b/src/blackgui/guiutility.h
@@ -26,6 +26,9 @@ namespace BlackGui
         //! Main application window
         static CEnableForFramelessWindow *mainApplicationWindow();
 
+        //! Main application window widget
+        static QWidget *mainApplicationWindowWidget();
+
         //! Is main window frameless?
         static bool isMainWindowFrameless();