diff --git a/uppsrc/CtrlCore/CtrlChild.cpp b/uppsrc/CtrlCore/CtrlChild.cpp
index 6b7dda65c..690c44972 100644
--- a/uppsrc/CtrlCore/CtrlChild.cpp
+++ b/uppsrc/CtrlCore/CtrlChild.cpp
@@ -259,8 +259,9 @@ const Ctrl *Ctrl::GetOwnerCtrl() const    { return const_cast<Ctrl *>(this)->Get
 TopWindow *Ctrl::GetTopWindow()
 {
 	GuiLock __;
-	Ctrl *q = GetTopCtrl();
+	Ctrl *q = this;
 	while(q) {
+		q = q->GetTopCtrl();
 		TopWindow *w = dynamic_cast<TopWindow *>(q);
 		if(w) return w;
 		q = q->GetOwner();
diff --git a/uppsrc/CtrlCore/TopWindow.cpp b/uppsrc/CtrlCore/TopWindow.cpp
index 7ea39ec11..564b27922 100644
--- a/uppsrc/CtrlCore/TopWindow.cpp
+++ b/uppsrc/CtrlCore/TopWindow.cpp
@@ -441,6 +441,14 @@ TopWindow& TopWindow::Urgent(bool b)
 	return *this;
 }
 
+TopWindow& TopWindow::FrameLess(bool b)
+{
+	GuiLock __;
+	frameless = b;
+	SyncCaption();
+	return *this;
+}
+
 void TopWindow::ShutdownWindow()
 {
 }