2 files changed, 7 insertions, 9 deletions

diff --git a/src/FbWinFrame.cc b/src/FbWinFrame.cc
index 234364e..a806888 100644
--- a/src/FbWinFrame.cc
+++ b/src/FbWinFrame.cc
@@ -871,8 +871,13 @@ void FbWinFrame::reconfigure() {
     gravityTranslate(grav_x, grav_y, -m_active_gravity, m_active_orig_client_bw, false);
 
     m_bevel = theme()->bevelWidth();
-    // reconfigure can't set borderwidth, as it doesn't know
-    // if it's meant to be borderless or not
+    setBorderWidth(m_decoration_mask & DECORM_BORDER ?
+                   theme()->border().width() : 0);
+
+    if (m_decoration_mask & DECORM_HANDLE && theme()->handleWidth() != 0)
+        showHandle();
+    else
+        hideHandle();
 
     unsigned int orig_handle_h = handle().height();
     if (m_use_handle && orig_handle_h != theme()->handleWidth())
diff --git a/src/Window.cc b/src/Window.cc
index a7b2331..8ad1762 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -4077,13 +4077,6 @@ void FluxboxWindow::updateButtons() {
  */
 void FluxboxWindow::reconfigTheme() {
 
-    m_frame.setBorderWidth(decorations.border ?
-                           frame().theme()->border().width() : 0);
-    if (decorations.handle && frame().theme()->handleWidth() != 0)
-        frame().showHandle();
-    else
-        frame().hideHandle();
-
     ClientList::iterator it = clientList().begin();
     ClientList::iterator it_end = clientList().end();