diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml
index 5a60f552f4..1fb25efe74 100644
--- a/resources/qml/Cura.qml
+++ b/resources/qml/Cura.qml
@@ -42,12 +42,6 @@ UM.MainWindow
         tooltip.hide();
     }
 
-    WelcomeDialog
-    {
-        id: welcomeDialog
-        visible: true  // True, so if somehow no preferences are found/loaded, it's shown anyway.
-    }
-
     Rectangle
     {
         id: greyOutBackground
@@ -56,6 +50,22 @@ UM.MainWindow
         color: UM.Theme.getColor("window_disabled_background")
         opacity: 0.7
         z: stageMenu.z + 1
+
+        MouseArea
+        {
+            // Prevent all mouse events from passing through.
+            enabled: parent.visible
+            anchors.fill: parent
+            hoverEnabled: true
+            acceptedButtons: Qt.LeftButton | Qt.RightButton
+        }
+    }
+
+    WelcomeDialog
+    {
+        id: welcomeDialog
+        visible: true  // True, so if somehow no preferences are found/loaded, it's shown anyway.
+        z: greyOutBackground.z + 1
     }
 
     Component.onCompleted:
diff --git a/resources/qml/WelcomePages/WelcomeDialog.qml b/resources/qml/WelcomePages/WelcomeDialog.qml
index b26fa06df7..fa5a09c8e6 100644
--- a/resources/qml/WelcomePages/WelcomeDialog.qml
+++ b/resources/qml/WelcomePages/WelcomeDialog.qml
@@ -13,18 +13,16 @@ import Cura 1.1 as Cura
 //
 // This is a no-frame dialog that shows the welcome process.
 //
-Window
+Item
 {
     UM.I18nCatalog { id: catalog; name: "cura" }
 
     id: dialog
-    title: catalog.i18nc("@title", "Welcome to Ultimaker Cura")
-    modality: Qt.ApplicationModal
-    flags: Qt.Dialog | Qt.FramelessWindowHint
+
+    anchors.centerIn: parent
 
     width: 580 * screenScaleFactor
     height: 600 * screenScaleFactor
-    color: "transparent"
 
     property int shadowOffset: 1 * screenScaleFactor
 
diff --git a/resources/qml/WelcomePages/WizardPanel.qml b/resources/qml/WelcomePages/WizardPanel.qml
index 94fb083664..27b1878a1a 100644
--- a/resources/qml/WelcomePages/WizardPanel.qml
+++ b/resources/qml/WelcomePages/WizardPanel.qml
@@ -25,6 +25,8 @@ Item
     property var progressValue: model == null ? 0 : model.currentProgress
     property string pageUrl: currentItem == null ? "" : currentItem.page_url
 
+    property alias backgroundColor: panelBackground.color
+
     signal showNextPage()
     signal showPreviousPage()
     signal goToPage(string page_id)  // Go to a specific page by the given page_id.
@@ -41,7 +43,7 @@ Item
         id: panelBackground
         anchors.fill: parent
         radius: UM.Theme.getSize("default_radius").width
-
+        color: UM.Theme.getColor("main_background")
         Cura.ProgressBar
         {
             id: progressBar