diff --git a/Code/Tools/ProjectManager/Source/ExternalLinkDialog.cpp b/Code/Tools/ProjectManager/Source/ExternalLinkDialog.cpp
index 726f4e5119..2d24913b5d 100644
--- a/Code/Tools/ProjectManager/Source/ExternalLinkDialog.cpp
+++ b/Code/Tools/ProjectManager/Source/ExternalLinkDialog.cpp
@@ -85,6 +85,6 @@ namespace O3DE::ProjectManager
 
     void ExternalLinkDialog::SetSkipDialogSetting(bool state)
     {
-        SettingsInterface::Get()->Set(QString(ISettings::ExternalLinkWarningKey), state);
+        SettingsInterface::Get()->Set(ISettings::ExternalLinkWarningKey, state);
     }
 } // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Source/LinkWidget.cpp b/Code/Tools/ProjectManager/Source/LinkWidget.cpp
index 1872afe4be..bdafec24d8 100644
--- a/Code/Tools/ProjectManager/Source/LinkWidget.cpp
+++ b/Code/Tools/ProjectManager/Source/LinkWidget.cpp
@@ -31,7 +31,7 @@ namespace O3DE::ProjectManager
         {
             // Check if user request not to be shown external link warning dialog
             bool skipDialog = false;
-            SettingsInterface::Get()->Get(skipDialog, QString(ISettings::ExternalLinkWarningKey));
+            SettingsInterface::Get()->Get(skipDialog, ISettings::ExternalLinkWarningKey);
 
             if (!skipDialog)
             {
diff --git a/Code/Tools/ProjectManager/Source/Settings.cpp b/Code/Tools/ProjectManager/Source/Settings.cpp
index e6adc5069c..0a8b600dd9 100644
--- a/Code/Tools/ProjectManager/Source/Settings.cpp
+++ b/Code/Tools/ProjectManager/Source/Settings.cpp
@@ -22,7 +22,7 @@ namespace O3DE::ProjectManager
         AZ_Assert(m_settingsRegistry, "Failed to create Settings");
     }
 
-    bool Settings::Save()
+    void Settings::Save()
     {
         AZ::SettingsRegistryMergeUtils::DumperSettings dumperSettings;
         dumperSettings.m_prettifyOutput = true;
@@ -34,7 +34,7 @@ namespace O3DE::ProjectManager
                 *m_settingsRegistry, ProjectManagerKeyPrefix, stringStream, dumperSettings))
         {
             AZ_Warning("ProjectManager", false, "Could not save Project Manager settings to stream");
-            return false;
+            return;
         }
 
         AZ::IO::FixedMaxPath o3deUserPath = AZ::Utils::GetO3deManifestDirectory();
@@ -52,18 +52,13 @@ namespace O3DE::ProjectManager
         }
 
         AZ_Warning("ProjectManager", saved, "Unable to save Project Manager registry file to path: %s", o3deUserPath.c_str());
-        return saved;
     }
 
-    bool Settings::OnSettingsChanged()
+    void Settings::OnSettingsChanged()
     {
         if (m_saveToDisk)
         {
-            return Save();
-        }
-        else
-        {
-            return true;
+            Save();
         }
     }
 
diff --git a/Code/Tools/ProjectManager/Source/Settings.h b/Code/Tools/ProjectManager/Source/Settings.h
index fb6087358b..a3b2a7212e 100644
--- a/Code/Tools/ProjectManager/Source/Settings.h
+++ b/Code/Tools/ProjectManager/Source/Settings.h
@@ -38,8 +38,8 @@ namespace O3DE::ProjectManager
         bool SetProjectBuiltSuccessfully(const ProjectInfo& projectInfo, bool successfullyBuilt) override;
 
     private:
-        bool Save();
-        bool OnSettingsChanged();
+        void Save();
+        void OnSettingsChanged();
 
         bool GetBuiltSuccessfullyPaths(AZStd::set<AZStd::string>& result);
 
diff --git a/Code/Tools/ProjectManager/Source/UpdateProjectSettingsScreen.cpp b/Code/Tools/ProjectManager/Source/UpdateProjectSettingsScreen.cpp
index 6589ee25e6..30735dcc97 100644
--- a/Code/Tools/ProjectManager/Source/UpdateProjectSettingsScreen.cpp
+++ b/Code/Tools/ProjectManager/Source/UpdateProjectSettingsScreen.cpp
@@ -63,10 +63,7 @@ namespace O3DE::ProjectManager
         m_advancedSettingsCollapseButton->setFlat(true);
         m_advancedSettingsCollapseButton->setFocusPolicy(Qt::NoFocus);
         m_advancedSettingsCollapseButton->setFixedWidth(s_collapseButtonSize);
-        connect(m_advancedSettingsCollapseButton, &QPushButton::clicked, this, [=]()
-            {
-                UpdateAdvancedSettingsCollapseState();
-            });
+        connect(m_advancedSettingsCollapseButton, &QPushButton::clicked, this, &UpdateProjectSettingsScreen::UpdateAdvancedSettingsCollapseState);
         advancedCollapseLayout->addWidget(m_advancedSettingsCollapseButton);
 
         // Category title
diff --git a/Code/Tools/ProjectManager/Source/UpdateProjectSettingsScreen.h b/Code/Tools/ProjectManager/Source/UpdateProjectSettingsScreen.h
index 40d1ccb9af..28ea032985 100644
--- a/Code/Tools/ProjectManager/Source/UpdateProjectSettingsScreen.h
+++ b/Code/Tools/ProjectManager/Source/UpdateProjectSettingsScreen.h
@@ -40,7 +40,6 @@ namespace O3DE::ProjectManager
         bool ValidateProjectPath() override;
         virtual bool ValidateProjectPreview();
         bool ValidateProjectId();
-        void UpdateAdvancedSettingsCollapseState();
 
         inline constexpr static int s_collapseButtonSize = 24;
 
@@ -53,6 +52,9 @@ namespace O3DE::ProjectManager
 
         ProjectInfo m_projectInfo;
         bool m_userChangedPreview; //! Did the user change the project preview path
+
+    protected slots:
+        void UpdateAdvancedSettingsCollapseState();
     };
 
 } // namespace O3DE::ProjectManager