diff --git a/radio/src/thirdparty/libopenui/src/layer.h b/radio/src/thirdparty/libopenui/src/layer.h
index d0c8692c5..1422dc64e 100644
--- a/radio/src/thirdparty/libopenui/src/layer.h
+++ b/radio/src/thirdparty/libopenui/src/layer.h
@@ -41,6 +41,10 @@ class Layer
         parentLayer.focus = Window::getFocus();
       }
       stack.emplace_back(Layer(window));
+      TRACE_WINDOWS("New layer added for %s (%d layers)", window->getWindowDebugString().c_str(), stack.size());
+      for (auto layer: stack) {
+        TRACE_WINDOWS(" - %s (focus=%s)", layer.main->getWindowDebugString().c_str(), layer.focus ? layer.focus->getWindowDebugString().c_str() : "---");
+      }
     }
 
     static void pop(Window * window)
@@ -61,5 +65,10 @@ class Layer
           }
         }
       }
+
+      TRACE_WINDOWS("Layer removed for %s (%d layers)", window->getWindowDebugString().c_str(), stack.size());
+      for (auto layer: stack) {
+        TRACE_WINDOWS(" - %s (focus=%s)", layer.main->getWindowDebugString().c_str(), layer.focus ? layer.focus->getWindowDebugString().c_str() : "---");
+      }
     }
 };
diff --git a/radio/src/thirdparty/libopenui/src/menu.h b/radio/src/thirdparty/libopenui/src/menu.h
index 20960c31e..2af7ca085 100644
--- a/radio/src/thirdparty/libopenui/src/menu.h
+++ b/radio/src/thirdparty/libopenui/src/menu.h
@@ -163,6 +163,13 @@ class Menu: public ModalWindow
 
   public:
     explicit Menu(Window * parent, bool multiple = false);
+
+#if defined(DEBUG_WINDOWS)
+    std::string getName() const override
+    {
+      return "Menu";
+    }
+#endif
     
     void setCancelHandler(std::function<void()> handler)
     {