diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 639d195c3..09d08ce1b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -100,6 +100,14 @@
              </intent-filter>
             <meta-data android:name="android.app.searchable" android:resource="@xml/searchable" />
         </activity>
+        <activity android:name="com.keepassdroid.PanicResponderActivity"
+                  android:launchMode="singleInstance" android:noHistory="true"
+                  android:theme="@android:style/Theme.NoDisplay">
+          <intent-filter>
+            <action android:name="info.guardianproject.panic.action.TRIGGER" />
+            <category android:name="android.intent.category.DEFAULT" />
+          </intent-filter>
+        </activity>
         <activity android:name="com.keepassdroid.settings.AppSettingsActivity"
             android:theme="@style/NoTitleBar"></activity>
         <activity android:name="com.keepassdroid.GeneratePasswordActivity"
diff --git a/app/src/main/java/com/keepassdroid/PanicResponderActivity.java b/app/src/main/java/com/keepassdroid/PanicResponderActivity.java
new file mode 100644
index 000000000..5f6a0b3d4
--- /dev/null
+++ b/app/src/main/java/com/keepassdroid/PanicResponderActivity.java
@@ -0,0 +1,34 @@
+
+package com.keepassdroid;
+
+import android.annotation.SuppressLint;
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Build;
+import android.os.Bundle;
+
+import com.android.keepass.KeePass;
+import com.keepassdroid.app.App;
+
+public class PanicResponderActivity extends Activity {
+
+    public static final String PANIC_TRIGGER_ACTION = "info.guardianproject.panic.action.TRIGGER";
+
+    @SuppressLint("NewApi")
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        Intent intent = getIntent();
+        if (intent != null && PANIC_TRIGGER_ACTION.equals(intent.getAction())) {
+            App.setShutdown();
+            setResult(KeePass.EXIT_LOCK);
+        }
+
+        if (Build.VERSION.SDK_INT >= 21) {
+            finishAndRemoveTask();
+        } else {
+            finish();
+        }
+    }
+}