diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/AuthActivity.java b/app/src/main/java/com/beemdevelopment/aegis/ui/AuthActivity.java
index 53640bb2..447f939e 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/AuthActivity.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/AuthActivity.java
@@ -233,6 +233,10 @@ public class AuthActivity extends AegisActivity {
             popup.setElevation(5.0f);
         }
         _textPassword.post(() -> {
+            if (isFinishing()) {
+                return;
+            }
+
             // calculating the actual height of the popup window does not seem possible
             // adding 25dp seems to look good enough
             int yoff = _textPassword.getHeight()