diff --git a/apps.json b/apps.json
index 19fa93262..b92e08f30 100644
--- a/apps.json
+++ b/apps.json
@@ -3045,7 +3045,7 @@
 { "id": "kitchen",
   "name": "Kitchen Combo",
   "icon": "kitchen.png",
-  "version":"0.01",
+  "version":"0.02",
   "description": "Combination of the stepo, walkersclock, arrow and waypointer apps into a multiclock format. 'Everything but the kitchen sink'. Requires firmware v2.08.167 or later",
   "tags": "tool,outdoors,gps",
   "readme": "README.md",
diff --git a/apps/kitchen/ChangeLog b/apps/kitchen/ChangeLog
new file mode 100644
index 000000000..96aa1c45b
--- /dev/null
+++ b/apps/kitchen/ChangeLog
@@ -0,0 +1,2 @@
+0.01: First version
+0.02: compass disable BTN1,BTN2 while waiting for GPS to reach RUNNING status
diff --git a/apps/kitchen/compass.kit.js b/apps/kitchen/compass.kit.js
index b9272291d..f8b2c9393 100644
--- a/apps/kitchen/compass.kit.js
+++ b/apps/kitchen/compass.kit.js
@@ -106,6 +106,8 @@
     }
 
     function onButtonShort(btn) {
+      log_debug("onButtonShort()");
+      if (gpsObject.getState() !== gpsObject.GPS_RUNNING) return;
       switch(btn) {
       case 1:
         log_debug("prev waypoint");
@@ -128,7 +130,6 @@
       log_debug("markWaypoint()");
       if (btn !== 1) return;
       if (gpsObject.getState() !== gpsObject.GPS_RUNNING) return;
-
       log_debug("markWaypoint()");
       
       gpsObject.markWaypoint();
@@ -143,8 +144,8 @@
       wp_distance = gpsObject.getWPdistance();
       wp_bearing = gpsObject.getWPbearing();
       log_debug(wp);
-      log_debug(wp_distance);
-      log_debug(wp_bearing);
+      log_debug("wp_distance:" + wp_distance);
+      log_debug("wp_bearing:" + wp_bearing);
     }
     
     // takes 32ms
@@ -205,16 +206,8 @@
       var d = tiltfixread(CALIBDATA.offset,CALIBDATA.scale);
       heading = newHeading(d,heading);
 
-      if (gpsObject.getState() === gpsObject.GPS_RUNNING) {
-        wp_dist = gpsObject.getWPdistance();
-        wp_bearing = gpsObject.getWPbearing();
-        bearing = wp_bearing;
-      } else {
-        bearing = 0;
-        wp_distance = 0;
-        wp_bearing = 0;
-      }
-
+      getWaypoint();
+      
       var dir = bearing - heading;
       if (dir < 0) dir += 360;
       if (dir > 360) dir -= 360;