diff --git a/launcher/include/compatibilitytoolinstaller.h b/launcher/include/compatibilitytoolinstaller.h
index a65db97..c5c6d42 100644
--- a/launcher/include/compatibilitytoolinstaller.h
+++ b/launcher/include/compatibilitytoolinstaller.h
@@ -22,6 +22,7 @@ public:
 Q_SIGNALS:
     void installFinished();
     void error(QString message);
+    void removalFinished();
 
 private:
     LauncherCore &m_launcher;
diff --git a/launcher/src/compatibilitytoolinstaller.cpp b/launcher/src/compatibilitytoolinstaller.cpp
index 1599fcd..fbb839b 100644
--- a/launcher/src/compatibilitytoolinstaller.cpp
+++ b/launcher/src/compatibilitytoolinstaller.cpp
@@ -105,7 +105,7 @@ void CompatibilityToolInstaller::removeCompatibilityTool()
         astraToolDir.removeRecursively();
     }
 
-    Q_EMIT installFinished();
+    Q_EMIT removalFinished();
 }
 
 #include "moc_compatibilitytoolinstaller.cpp"
\ No newline at end of file
diff --git a/launcher/ui/Settings/CompatibilityToolSetup.qml b/launcher/ui/Settings/CompatibilityToolSetup.qml
index 9026530..d1c301e 100644
--- a/launcher/ui/Settings/CompatibilityToolSetup.qml
+++ b/launcher/ui/Settings/CompatibilityToolSetup.qml
@@ -3,6 +3,7 @@
 
 import QtQuick
 import QtQuick.Layouts
+import QtQuick.Controls as QQC2
 
 import org.kde.kirigami as Kirigami
 import org.kde.kirigamiaddons.formcard as FormCard
@@ -12,7 +13,7 @@ import zone.xiv.astra
 FormCard.FormCardPage {
     id: page
 
-    property var installer: null
+    readonly property CompatibilityToolInstaller installer: LauncherCore.createCompatInstaller()
 
     title: i18nc("@title:window", "Compatibility Tool")
 
@@ -33,10 +34,7 @@ FormCard.FormCardPage {
 
             text: i18n("Install Tool")
             icon.name: "install"
-            onClicked: {
-                page.installer = LauncherCore.createCompatInstaller();
-                page.installer.installCompatibilityTool();
-            }
+            onClicked: page.installer.installCompatibilityTool()
         }
 
         FormCard.FormDelegateSeparator {
@@ -49,34 +47,35 @@ FormCard.FormCardPage {
 
             text: i18n("Remove Tool")
             icon.name: "delete"
-            onClicked: {
-                page.installer = LauncherCore.createCompatInstaller();
-                page.installer.removeCompatibilityTool();
-            }
+            onClicked: page.installer.removeCompatibilityTool()
         }
     }
 
-    property Kirigami.PromptDialog errorDialog: Kirigami.PromptDialog {
-        title: i18n("Install error")
-
+    readonly property Kirigami.PromptDialog errorDialog: Kirigami.PromptDialog {
         showCloseButton: false
         standardButtons: Kirigami.Dialog.Ok
-
-        onAccepted: applicationWindow().pageStack.layers.pop()
-        onRejected: applicationWindow().pageStack.layers.pop()
+        parent: page.QQC2.Overlay.overlay
     }
 
     data: Connections {
-        enabled: page.installer !== null
         target: page.installer
 
         function onInstallFinished(): void {
-            applicationWindow().pageStack.layers.pop();
+            page.errorDialog.title = i18n("Install Success");
+            page.errorDialog.subtitle = i18n("Compatibility tool successfully installed!");
+            page.errorDialog.open();
         }
 
         function onError(message: string): void {
+            page.errorDialog.title = i18n("Install Error");
             page.errorDialog.subtitle = message;
             page.errorDialog.open();
         }
+
+        function onRemovalFinished(): void {
+            page.errorDialog.title = i18n("Removal Success");
+            page.errorDialog.subtitle = i18n("Compatibility tool successfully removed!");
+            page.errorDialog.open();
+        }
     }
 }