diff --git a/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml b/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml
index 575ec9c126..0d37b2092b 100644
--- a/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml
+++ b/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml
@@ -73,10 +73,9 @@ Item
 
                 Component.onCompleted:
                 {
-                    // select the first one that's not "unknown" by default.
+                    // Select the first one that's not "unknown" by default.
                     for (var i = 0; i < count; i++)
                     {
-
                         if (!model[i].is_unknown_machine_type)
                         {
                             currentIndex = i
diff --git a/resources/qml/WelcomePages/AddPrinterByIpContent.qml b/resources/qml/WelcomePages/AddPrinterByIpContent.qml
index f3ed58200b..e71efb09aa 100644
--- a/resources/qml/WelcomePages/AddPrinterByIpContent.qml
+++ b/resources/qml/WelcomePages/AddPrinterByIpContent.qml
@@ -18,7 +18,9 @@ Item
 
     id: addPrinterByIpScreen
 
+    // Whether an IP address is currently being resolved.
     property bool hasSentRequest: false
+    // Whether the IP address user entered can be resolved as a recognizable printer.
     property bool haveConnection: false
 
     Label
@@ -116,7 +118,7 @@ Item
                 }
             }
 
-            Rectangle
+            Item
             {
                 width: parent.width
                 anchors.top: userInputFields.bottom
@@ -133,7 +135,7 @@ Item
                     text: catalog.i18nc("@label", "The printer at this address has not responded yet.")
                 }
 
-                Rectangle
+                Item
                 {
                     id: printerInfoLabels
                     anchors.top: parent.top
@@ -202,9 +204,7 @@ Item
         text: catalog.i18nc("@button", "Cancel")
         width: UM.Theme.getSize("action_button").width
         fixedWidthMode: true
-        onClicked: base.gotoPage("add_printer_by_selection")
-
-        enabled: true
+        onClicked: base.goToPage("add_printer_by_selection")
     }
 
     Cura.PrimaryButton
diff --git a/resources/qml/WelcomePages/AddPrinterBySelectionContent.qml b/resources/qml/WelcomePages/AddPrinterBySelectionContent.qml
index 4b9ef1a779..69a5a99ac1 100644
--- a/resources/qml/WelcomePages/AddPrinterBySelectionContent.qml
+++ b/resources/qml/WelcomePages/AddPrinterBySelectionContent.qml
@@ -67,7 +67,7 @@ Item
 
                 onAddByIpButtonClicked:
                 {
-                    base.gotoPage("add_printer_by_ip")
+                    base.goToPage("add_printer_by_ip")
                 }
             }
         }
@@ -139,7 +139,7 @@ Item
                 CuraApplication.getDiscoveredPrintersModel().createMachineFromDiscoveredPrinter(networkPrinterItem)
 
                 // If we have created a machine, go to the last page, which is the "cloud" page.
-                base.gotoPage("cloud")
+                base.goToPage("cloud")
             }
             else
             {
@@ -147,7 +147,7 @@ Item
                 const localPrinterItem = addLocalPrinterDropDown.contentItem.currentItem
                 Cura.MachineManager.addMachine(localPrinterItem.id)
 
-                base.gotoPage("machine_actions")
+                base.goToPage("machine_actions")
             }
         }
     }
diff --git a/resources/qml/WelcomePages/StepPanel.qml b/resources/qml/WelcomePages/StepPanel.qml
index 4cf6307a92..5623034621 100644
--- a/resources/qml/WelcomePages/StepPanel.qml
+++ b/resources/qml/WelcomePages/StepPanel.qml
@@ -31,7 +31,7 @@ Item
     signal showNextPage()
     signal showPreviousPage()
     signal passLastPage()  // Emitted when there is no more page to show
-    signal gotoPage(string page_id)  // Go to a specific page by the given page_id.
+    signal goToPage(string page_id)  // Go to a specific page by the given page_id.
 
     onShowNextPage:
     {
@@ -52,7 +52,7 @@ Item
         }
     }
 
-    onGotoPage:
+    onGoToPage:
     {
         // find the page index
         var page_index = -1
@@ -108,7 +108,6 @@ Item
         source: parent
         horizontalOffset: base.shadowOffset
         verticalOffset: base.shadowOffset
-        visible: true
         color: UM.Theme.getColor("monitor_shadow")
         transparentBorder: true
         // Should always be drawn behind the background.