1 files changed, 8 insertions, 0 deletions
diff --git a/sd/source/ui/sidebar/SlideBackground.cxx b/sd/source/ui/sidebar/SlideBackground.cxx
index fb720af1f034..efb397c44415 100644
--- a/sd/source/ui/sidebar/SlideBackground.cxx
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
@@ -303,6 +303,7 @@ void SlideBackground::HandleContextChange(
             mxCloseMaster->show();
             mxEditMaster->hide();
             mxMasterSlide->set_sensitive(false);
+            mxMasterSlide->clear();
             mxDspMasterBackground->set_sensitive(false);
             mxDspMasterObjects->set_sensitive(false);
             mxFillStyle->hide();
@@ -314,6 +315,7 @@ void SlideBackground::HandleContextChange(
             mxCloseMaster->hide();
             mxEditMaster->hide();
             mxMasterSlide->set_sensitive(false);
+            mxMasterSlide->clear();
             mxDspMasterBackground->set_sensitive(false);
             mxDspMasterObjects->set_sensitive(false);
             mxFillStyle->hide();
@@ -325,6 +327,7 @@ void SlideBackground::HandleContextChange(
             mxCloseMaster->hide();
             mxEditMaster->show();
             mxMasterSlide->set_sensitive(true);
+            populateMasterSlideDropdown();
             mxDspMasterBackground->set_sensitive(true);
             mxDspMasterObjects->set_sensitive(true);
             mxFillStyle->show();
@@ -448,6 +451,11 @@ void SlideBackground::Update()
         default:
             break;
     }
+
+    // Need to do a relayouting, otherwise the panel size is not updated after show / hide controls
+    sfx2::sidebar::Panel* pPanel = dynamic_cast<sfx2::sidebar::Panel*>(GetParent());
+    if (pPanel)
+        pPanel->TriggerDeckLayouting();
 }
 
 void SlideBackground::UpdateMarginBox()