diff --git a/docs/changes.txt b/docs/changes.txt
index 64fe383693..1984b19fe2 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -242,6 +242,9 @@ Changes in behaviour not resulting in compilation errors, please read this!
 - wxGridBagSizer::AddGrowable{Col,Row}() must now be called after the items are
   added to the sizer, i.e. the columns and rows already exist.
 
+- wxWindow::FindWindow() skips over top level children now as finding a child
+  dialog when looking for a child control could have been very unexpected.
+
 
 Changes in behaviour which may result in compilation errors
 -----------------------------------------------------------
diff --git a/interface/wx/window.h b/interface/wx/window.h
index 7fe353a519..384b7d3326 100644
--- a/interface/wx/window.h
+++ b/interface/wx/window.h
@@ -455,13 +455,21 @@ public:
 
     /**
         Find a child of this window, by @a id.
+
         May return @a this if it matches itself.
+
+        Notice that only real children, not top level windows using this window
+        as parent, are searched by this function.
     */
     wxWindow* FindWindow(long id) const;
 
     /**
         Find a child of this window, by name.
+
         May return @a this if it matches itself.
+
+        Notice that only real children, not top level windows using this window
+        as parent, are searched by this function.
     */
     wxWindow* FindWindow(const wxString& name) const;