diff --git a/mass_storage/main.py b/mass_storage/main.py
new file mode 100644
index 0000000..d4211a4
--- /dev/null
+++ b/mass_storage/main.py
@@ -0,0 +1,20 @@
+"""Enables mass storage mode in a safe way"""
+
+___name___         = "Mass Storage Enabler"
+___license___      = "MIT"
+___dependencies___ = ["dialogs", "ugfx_helper"]
+___categories___   = ["EMF"]
+___bootstrapped___ = True
+
+import ugfx, tilda, ugfx_helper, dialogs
+
+ugfx_helper.init()
+ugfx.clear()
+
+print("enabling USB storage...")
+tilda.storage_enable_usb()
+print("DONE")
+with dialogs.WaitingMessage(title="Mass Storage Enabled", text="You can now use the badge like a USB key.\nPlease safely eject afterwards. This app will close automatically."):
+    print("Waiting for USB mass storage to be unmounted...")
+    tilda.storage_disable_usb()
+    print("DONE")