diff --git a/apps.json b/apps.json
index ebc0d7fa7..ab8333afc 100644
--- a/apps.json
+++ b/apps.json
@@ -92,11 +92,12 @@
   { "id": "gbridge",
     "name": "Gadgetbridge",
     "icon": "app.png",
-    "version":"0.06",
+    "version":"0.07",
     "description": "The default notification handler for Gadgetbridge notifications from Android",
     "tags": "tool,system,android,widget",
+    "type":"widget",
     "storage": [
-      {"name":"gbridge.app.js","url":"app.js"},
+      {"name":"gbridge.settings.js","url":"settings.js"},
       {"name":"gbridge.img","url":"app-icon.js","evaluate":true},
       {"name":"gbridge.wid.js","url":"widget.js"}
     ]
diff --git a/apps/gbridge/ChangeLog b/apps/gbridge/ChangeLog
index 0bcf94e25..e02ef176d 100644
--- a/apps/gbridge/ChangeLog
+++ b/apps/gbridge/ChangeLog
@@ -5,3 +5,4 @@
 0.05: Show incoming call notification
       Optimize animation, limit title length
 0.06: Gadgetbridge App 'Connected' state is no longer toggleable
+0.07: Move configuration to settings menu
diff --git a/apps/gbridge/app.js b/apps/gbridge/app.js
deleted file mode 100644
index d12f0f768..000000000
--- a/apps/gbridge/app.js
+++ /dev/null
@@ -1,19 +0,0 @@
-function gb(j) {
-  Bluetooth.println(JSON.stringify(j));
-}
-
-var mainmenu = {
-  "" : { "title" : "Gadgetbridge" },
-  "Connected" : { value : NRF.getSecurityStatus().connected?"Yes":"No" },
-  "Find Phone" : function() { E.showMenu(findPhone); },
-  "Exit" : ()=> {load();},
-};
-
-var findPhone = {
-  "" : { "title" : "-- Find Phone --" },
-  "On" : _=>gb({t:"findPhone",n:true}),
-  "Off" : _=>gb({t:"findPhone",n:false}),
-  "< Back" : function() { E.showMenu(mainmenu); },
-};
-
-E.showMenu(mainmenu);
diff --git a/apps/gbridge/settings.js b/apps/gbridge/settings.js
new file mode 100644
index 000000000..723c9cae9
--- /dev/null
+++ b/apps/gbridge/settings.js
@@ -0,0 +1,21 @@
+(function(back) {
+  function gb(j) {
+    Bluetooth.println(JSON.stringify(j));
+  }
+
+  var mainmenu = {
+    "" : { "title" : "Gadgetbridge" },
+    "Connected" : { value : NRF.getSecurityStatus().connected?"Yes":"No" },
+    "Find Phone" : function() { E.showMenu(findPhone); },
+    "< Back" : back,
+  };
+
+  var findPhone = {
+    "" : { "title" : "-- Find Phone --" },
+    "On" : _=>gb({t:"findPhone",n:true}),
+    "Off" : _=>gb({t:"findPhone",n:false}),
+    "< Back" : function() { E.showMenu(mainmenu); },
+  };
+
+  E.showMenu(mainmenu);
+})