diff --git a/radio/src/thirdparty/libopenui/src/window.cpp b/radio/src/thirdparty/libopenui/src/window.cpp
index 3bd69c198..7953367e6 100644
--- a/radio/src/thirdparty/libopenui/src/window.cpp
+++ b/radio/src/thirdparty/libopenui/src/window.cpp
@@ -53,10 +53,9 @@ Window::~Window()
 
 void Window::attach(Window * newParent)
 {
-  if (parent)
-    detach();
+  if (parent) detach();
   parent = newParent;
-  newParent->addChild(this);
+  if (newParent) newParent->addChild(this);
 }
 
 void Window::detach()