diff --git a/gpio_shutdown.py b/gpio_shutdown.py
new file mode 100644
index 0000000..26ea4d2
--- /dev/null
+++ b/gpio_shutdown.py
@@ -0,0 +1,30 @@
+import pwnagotchi.plugins as plugins
+import logging
+import RPi.GPIO as GPIO
+import pwnagotchi
+
+
+
+class GPIOShutdown(plugins.Plugin):
+
+    __author__ = 'tomelleri.riccardo@gmail.com'
+    __version__ = '1.0.0'
+    __license__ = 'GPL3'
+    __description__ = 'GPIO Shutdown plugin'
+
+
+    def shutdown(self, channel):
+        logging.warning('Received shutdown command from GPIO')
+        pwnagotchi.shutdown()
+
+
+    def on_loaded(self):
+
+        logging.info('GPIO Shutdown plugin loaded')
+
+        shutdown_gpio = self.options['gpio']
+        GPIO.setmode(GPIO.BCM)
+        GPIO.setup(shutdown_gpio, GPIO.IN, GPIO.PUD_UP)
+        GPIO.add_event_detect(shutdown_gpio, GPIO.FALLING, callback = self.shutdown)
+
+        logging.info("Added shutdown command to GPIO %d", shutdown_gpio)
diff --git a/gpio_shutdown.yml b/gpio_shutdown.yml
new file mode 100644
index 0000000..977a95c
--- /dev/null
+++ b/gpio_shutdown.yml
@@ -0,0 +1,3 @@
+gpio_shutdown:
+    enabled: false
+    gpio: 21