diff --git a/src/common/toplvcmn.cpp b/src/common/toplvcmn.cpp
index 6c9f3d89f9..865d29f444 100644
--- a/src/common/toplvcmn.cpp
+++ b/src/common/toplvcmn.cpp
@@ -113,14 +113,12 @@ void wxTopLevelWindowBase::DoClientToScreen(int *x, int *y) const
 // whole client area
 void wxTopLevelWindowBase::OnSize(wxSizeEvent& WXUNUSED(event))
 {
-    // if we're using constraints - do use them
-#if wxUSE_CONSTRAINTS
+    // if we're using constraints or sizers - do use them
     if ( GetAutoLayout() )
     {
         Layout();
     }
     else
-#endif // wxUSE_CONSTRAINTS
     {
         // do we have _exactly_ one child?
         wxWindow *child = (wxWindow *)NULL;
diff --git a/src/x11/toplevel.cpp b/src/x11/toplevel.cpp
index fd6dea93f9..645a179f70 100644
--- a/src/x11/toplevel.cpp
+++ b/src/x11/toplevel.cpp
@@ -163,6 +163,7 @@ bool wxTopLevelWindowX11::Create(wxWindow *parent,
                   FocusChangeMask |
                   ColormapChangeMask |
                   StructureNotifyMask |
+                  ConfigureNotify |
                   PropertyChangeMask
                   );
     
@@ -416,6 +417,11 @@ bool wxSetWMDecorations(Window w, long style)
     {
         wmProp.props |= GR_WM_PROPS_CAPTION ;
         wmProp.flags |= GR_WM_FLAGS_PROPS ;
+
+        // The default dialog style doesn't include any kind
+        // of border, which is a bit odd. Anyway, inclusion
+        // of a caption surely implies a border.
+        style |= wxTHICK_FRAME;
     }
 
     if (style & wxTHICK_FRAME)