diff --git a/clive/__private/ui/dialogs/add_tracked_account_dialog.py b/clive/__private/ui/dialogs/add_tracked_account_dialog.py
index 9602ce2c867e012810656ef0f4a1266b1d99cd29..5069b64782e56a3a188a60d4c56e0a7bf95d93a0 100644
--- a/clive/__private/ui/dialogs/add_tracked_account_dialog.py
+++ b/clive/__private/ui/dialogs/add_tracked_account_dialog.py
@@ -31,4 +31,4 @@ class AddTrackedAccountDialog(CliveActionDialog):
     async def save_account(self) -> None:
         is_account_saved = await self._add_account_container.save_account()
         if is_account_saved:
-            self.app.pop_screen()
+            self.dismiss()
diff --git a/clive/__private/ui/dialogs/clive_base_dialogs.py b/clive/__private/ui/dialogs/clive_base_dialogs.py
index c4e638cd6e9e2e9004b0c702552ae556e975f9fb..e8a44517e2ad1d56842208c57a795e44b4f773ee 100644
--- a/clive/__private/ui/dialogs/clive_base_dialogs.py
+++ b/clive/__private/ui/dialogs/clive_base_dialogs.py
@@ -130,7 +130,7 @@ class CliveActionDialog(CliveBaseDialog[ScreenResultT], ABC):
 
     @on(CancelOneLineButton.Pressed)
     def action_cancel(self) -> None:
-        self.app.pop_screen()
+        self.dismiss()
 
 
 class CliveInfoDialog(CliveBaseDialog[None], ABC):
@@ -141,4 +141,4 @@ class CliveInfoDialog(CliveBaseDialog[None], ABC):
 
     @on(CloseOneLineButton.Pressed)
     def action_close(self) -> None:
-        self.app.pop_screen()
+        self.dismiss()
diff --git a/clive/__private/ui/dialogs/mark_alarm_as_harmless_dialog.py b/clive/__private/ui/dialogs/mark_alarm_as_harmless_dialog.py
index 74303a56a72841ef2b2e4dd0a04065223ae53260..d6b1e2735c4e48168ad11c4a878b2d062ca4016b 100644
--- a/clive/__private/ui/dialogs/mark_alarm_as_harmless_dialog.py
+++ b/clive/__private/ui/dialogs/mark_alarm_as_harmless_dialog.py
@@ -31,4 +31,4 @@ class MarkAlarmAsHarmlessDialog(ConfirmActionDialog):
         self._alarm.is_harmless = True
         self.notify(f"Alarm `{self.alarm_info}` was marked as harmless.")
         self.app.trigger_profile_watchers()
-        self.app.pop_screen()
+        self.dismiss()
diff --git a/clive/__private/ui/dialogs/switch_working_account_dialog.py b/clive/__private/ui/dialogs/switch_working_account_dialog.py
index ad828ae7b003e9896c57255dc06bc5395c449d7c..28442324b1ecc88a11637d636c5da9a91a4fc813 100644
--- a/clive/__private/ui/dialogs/switch_working_account_dialog.py
+++ b/clive/__private/ui/dialogs/switch_working_account_dialog.py
@@ -32,4 +32,4 @@ class SwitchWorkingAccountDialog(CliveActionDialog):
     @on(CliveActionDialog.Confirmed)
     def confirm_selected_working_account(self) -> None:
         self._switch_working_account_container.confirm_selected_working_account()
-        self.app.pop_screen()
+        self.dismiss()