diff --git a/src/com/keepassdroid/LockCloseActivity.java b/src/com/keepassdroid/LockCloseActivity.java
index 5ca0f8f15..85baca165 100644
--- a/src/com/keepassdroid/LockCloseActivity.java
+++ b/src/com/keepassdroid/LockCloseActivity.java
@@ -19,6 +19,8 @@
  */
 package com.keepassdroid;
 
+import android.os.Bundle;
+
 import com.android.keepass.KeePass;
 import com.keepassdroid.app.App;
 
@@ -27,11 +29,16 @@ public class LockCloseActivity extends LockingActivity {
 	@Override
 	protected void onResume() {
 		super.onResume();
-		
+
+		checkShutdown();
+	}
+	
+	private void checkShutdown() {
 		if ( App.isShutdown() ) {
 			setResult(KeePass.EXIT_LOCK);
 			finish();
 		}
+		
 	}
 
 }
diff --git a/src/com/keepassdroid/LockCloseListActivity.java b/src/com/keepassdroid/LockCloseListActivity.java
index fb4ba1c8a..5743f6a7d 100644
--- a/src/com/keepassdroid/LockCloseListActivity.java
+++ b/src/com/keepassdroid/LockCloseListActivity.java
@@ -1,5 +1,7 @@
 package com.keepassdroid;
 
+import android.os.Bundle;
+
 import com.android.keepass.KeePass;
 import com.keepassdroid.app.App;
 
@@ -8,11 +10,15 @@ public class LockCloseListActivity extends LockingListActivity {
 	@Override
 	protected void onResume() {
 		super.onResume();
-		
+
+		checkShutdown();
+	}
+
+	private void checkShutdown() {
 		if ( App.isShutdown() ) {
 			setResult(KeePass.EXIT_LOCK);
 			finish();
 		}
+		
 	}
-
 }