diff --git a/apps/imageclock/ChangeLog b/apps/imageclock/ChangeLog
index 344935dc4..59288bdd3 100644
--- a/apps/imageclock/ChangeLog
+++ b/apps/imageclock/ChangeLog
@@ -2,3 +2,4 @@
 0.02: Allow drawing polys
 0.03: Allow partly importing Amazfit decompiler formatted watchfaces
 0.04: Allow writing all image data to separate file to save some RAM
+      Allow hiding elements on lock
diff --git a/apps/imageclock/app.js b/apps/imageclock/app.js
index 67329810e..181683b63 100644
--- a/apps/imageclock/app.js
+++ b/apps/imageclock/app.js
@@ -510,7 +510,8 @@ function draw(element, offset){
     //print("Handling ", current, " with offset ", elementOffset);
     //print("Handling ", current);
     var currentElement = element[current];
-    var start = Date.now();
+
+    //var start = Date.now();
     try {
       switch(current){
         case "X":
@@ -518,6 +519,7 @@ function draw(element, offset){
         case "Properties":
         case "ForegroundColor":
         case "BackgroundColor":
+        case "HideOn":
           //Nothing to draw for these
           break;
         case "MultiState":
@@ -540,6 +542,10 @@ function draw(element, offset){
           break;
         default:
           //print("Enter next level", elementOffset);
+          if (currentElement.HideOn && currentElement.HideOn == "Lock" && Bangle.isLocked()){
+            //print("Hiding", current);
+            continue;
+          }
           draw(currentElement, elementOffset);
           //print("Done next level");
       }
@@ -570,7 +576,7 @@ function initialDraw(){
     //print(new Date().toISOString(), "Drawing start");
     var start = Date.now();
     draw(undefined, zeroOffset);
-    print(new Date().toISOString(), "Drawing done", (Date.now() - start).toFixed(0));
+    //print(new Date().toISOString(), "Drawing done", (Date.now() - start).toFixed(0));
     isDrawing = false;
     if (requestedDraws > 0){
       //print(new Date().toISOString(), "Had deferred drawing left, drawing again");