diff --git a/Code/Editor/Core/QtEditorApplication.cpp b/Code/Editor/Core/QtEditorApplication.cpp
index f5c886761c..04b5d45907 100644
--- a/Code/Editor/Core/QtEditorApplication.cpp
+++ b/Code/Editor/Core/QtEditorApplication.cpp
@@ -242,7 +242,7 @@ namespace Editor
     }
 
     EditorQtApplication::EditorQtApplication(int& argc, char** argv)
-        : QApplication(argc, argv)
+        : AzQtApplication(argc, argv)
         , m_inWinEventFilter(false)
         , m_stylesheet(new AzQtComponents::O3DEStylesheet(this))
         , m_idleTimer(new QTimer(this))
@@ -252,8 +252,6 @@ namespace Editor
         setWindowIcon(QIcon(":/Application/res/o3de_editor.ico"));
 
         // set the default key store for our preferences:
-        setOrganizationName("O3DE");
-        setOrganizationDomain("o3de.org");
         setApplicationName("O3DE Editor");
 
         connect(m_idleTimer, &QTimer::timeout, this, &EditorQtApplication::maybeProcessIdle);
diff --git a/Code/Editor/Core/QtEditorApplication.h b/Code/Editor/Core/QtEditorApplication.h
index 7baaae8e28..e782b8bfc7 100644
--- a/Code/Editor/Core/QtEditorApplication.h
+++ b/Code/Editor/Core/QtEditorApplication.h
@@ -7,7 +7,6 @@
 #pragma once
 
 #if !defined(Q_MOC_RUN)
-#include <QApplication>
 #include <QAbstractNativeEventFilter>
 #include <QColor>
 #include <QMap>
@@ -19,6 +18,7 @@
 #include <AzCore/PlatformDef.h>
 #include <AzCore/UserSettings/UserSettingsProvider.h>
 #include <IEditor.h>
+#include <AzQtComponents/Application/AzQtApplication.h>
 #endif
 
 class QFileInfo;
@@ -47,7 +47,7 @@ namespace Editor
     void ScanDirectories(QFileInfoList& directoryList, const QStringList& filters, QFileInfoList& files, ScanDirectoriesUpdateCallBack updateCallback = nullptr);
 
     class EditorQtApplication
-        : public QApplication
+        : public AzQtComponents::AzQtApplication
         , public QAbstractNativeEventFilter
         , public IEditorNotifyListener
         , public AZ::UserSettingsOwnerRequestBus::Handler
diff --git a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/ShaderManagementConsoleApplication.h b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/ShaderManagementConsoleApplication.h
index bd2e0b9403..e74458b2e7 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/ShaderManagementConsoleApplication.h
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/ShaderManagementConsoleApplication.h
@@ -7,7 +7,6 @@
 
 #pragma once
 
-
 #include <AzCore/Component/Entity.h>
 #include <AzCore/Component/TickBus.h>
 #include <AzCore/UserSettings/UserSettingsProvider.h>