diff --git a/src/branding/manjaro/branding.desc b/src/branding/manjaro/branding.desc
index 587e4338c..1b04c8e98 100644
--- a/src/branding/manjaro/branding.desc
+++ b/src/branding/manjaro/branding.desc
@@ -180,10 +180,10 @@ images:
 # branding component also ships a stylesheet.qss. Then they are
 # the corresponding CSS attributes of #sidebarApp.
 style:
-   SidebarBackground:    "#263238"
-   SidebarText:          "#efefef"
-   SidebarTextCurrent:   "#4d915e"
-   SidebarTextHighlight: "#1a1c1b"
+   sidebarBackground:    "#263238"
+   sidebarText:          "#efefef"
+   sidebarTextSelect:    "#4d915e"
+   sidebarTextHighlight: "#1a1c1b"
 
 
 ### SLIDESHOW
diff --git a/src/calamares/CalamaresApplication.cpp b/src/calamares/CalamaresApplication.cpp
index a72e0863d..88e8e2919 100644
--- a/src/calamares/CalamaresApplication.cpp
+++ b/src/calamares/CalamaresApplication.cpp
@@ -269,11 +269,10 @@ CalamaresApplication::initViewSteps()
 {
     cDebug() << "STARTUP: loadModules for all modules done";
     m_moduleManager->checkRequirements();
-    if ( Calamares::Branding::instance()->windowFullscreen() )
+    if ( Calamares::Branding::instance()->windowMaximize() )
     {
         m_mainwindow->setWindowFlag( Qt::FramelessWindowHint );
-        m_mainwindow->setWindowFlag( Qt::WindowStaysOnTopHint );
-        m_mainwindow->showFullscreen();
+        m_mainwindow->showMaximized();
     }
     else
     {
diff --git a/src/libcalamaresui/Branding.h b/src/libcalamaresui/Branding.h
index 908693e81..a5a2e535d 100644
--- a/src/libcalamaresui/Branding.h
+++ b/src/libcalamaresui/Branding.h
@@ -219,7 +219,7 @@ public:
 
     bool welcomeStyleCalamares() const { return m_welcomeStyleCalamares; }
     bool welcomeExpandingLogo() const { return m_welcomeExpandingLogo; }
-    bool windowFullscreen() const { return m_windowExpansion == WindowExpansion::Fullscreen; }
+    bool windowMaximize() const { return m_windowExpansion == WindowExpansion::Fullscreen; }
     bool windowExpands() const { return m_windowExpansion != WindowExpansion::Fixed; }
     QPair< WindowDimension, WindowDimension > windowSize() const
     {