diff --git a/cura/UI/WelcomePagesModel.py b/cura/UI/WelcomePagesModel.py
index 3fdcebe0a0..3c2d0503ab 100644
--- a/cura/UI/WelcomePagesModel.py
+++ b/cura/UI/WelcomePagesModel.py
@@ -239,10 +239,6 @@ class WelcomePagesModel(ListModel):
                           {"id": "user_agreement",
                            "page_url": self._getBuiltinWelcomePagePath("UserAgreementContent.qml"),
                            },
-                          {"id": "whats_new",
-                           "page_url": self._getBuiltinWelcomePagePath("WhatsNewContent.qml"),
-                           "next_page_button_text": self._catalog.i18nc("@action:button", "Skip"),
-                           },
                           {"id": "data_collections",
                            "page_url": self._getBuiltinWelcomePagePath("DataCollectionsContent.qml"),
                            },
@@ -260,13 +256,21 @@ class WelcomePagesModel(ListModel):
                            },
                           {"id": "add_cloud_printers",
                            "page_url": self._getBuiltinWelcomePagePath("AddCloudPrintersView.qml"),
-                           "is_final_page": True,  # If we end up in this page, the next button will close the dialog
-                           "next_page_button_text": self._catalog.i18nc("@action:button", "Finish"),
+                           "next_page_button_text": self._catalog.i18nc("@action:button", "Next"),
+                           "next_page_id": "whats_new",
                            },
                           {"id": "machine_actions",
                            "page_url": self._getBuiltinWelcomePagePath("FirstStartMachineActionsContent.qml"),
                            "should_show_function": self.shouldShowMachineActions,
                            },
+                          {"id": "whats_new",
+                           "page_url": self._getBuiltinWelcomePagePath("WhatsNewContent.qml"),
+                           "next_page_button_text": self._catalog.i18nc("@action:button", "Skip"),
+                           },
+                          {"id": "changelog",
+                           "page_url": self._getBuiltinWelcomePagePath("ChangelogContent.qml"),
+                           "next_page_button_text": self._catalog.i18nc("@action:button", "Finish"),
+                           },
                           ]
 
         pages_to_show = all_pages_list
diff --git a/resources/qml/WelcomePages/AddCloudPrintersView.qml b/resources/qml/WelcomePages/AddCloudPrintersView.qml
index 32e6ffec39..524bf288a0 100644
--- a/resources/qml/WelcomePages/AddCloudPrintersView.qml
+++ b/resources/qml/WelcomePages/AddCloudPrintersView.qml
@@ -215,7 +215,7 @@ Item
         id: finishButton
         anchors.right: parent.right
         anchors.bottom: parent.bottom
-        text: catalog.i18nc("@button", "Finish")
+        text: base.currentItem.next_page_button_text
         onClicked:
         {
             discoveredCloudPrintersModel.clear()