2 files changed, 7 insertions, 6 deletions
diff --git a/include/svx/sidebar/AreaPropertyPanelBase.hxx b/include/svx/sidebar/AreaPropertyPanelBase.hxx
index 4885810fa623..802ac2857d28 100644
--- a/include/svx/sidebar/AreaPropertyPanelBase.hxx
+++ b/include/svx/sidebar/AreaPropertyPanelBase.hxx
@@ -97,6 +97,8 @@ private:
     void Initialize();
 
 protected:
+    const css::uno::Reference<css::frame::XFrame>&      mxFrame;
+
     sal_uInt16                                          meLastXFS;
 
     sal_Int32                                           mnLastPosHatch;
diff --git a/include/svx/sidebar/AreaTransparencyGradientPopup.hxx b/include/svx/sidebar/AreaTransparencyGradientPopup.hxx
index 2f5dcedec5c6..04b8fa91a8b6 100644
--- a/include/svx/sidebar/AreaTransparencyGradientPopup.hxx
+++ b/include/svx/sidebar/AreaTransparencyGradientPopup.hxx
@@ -20,6 +20,7 @@
 #define INCLUDED_SVX_SOURCE_SIDEBAR_AREA_AREATRANSPARENCYGRADIENTPOPUP_HXX
 
 #include <vcl/weld.hxx>
+#include <svtools/toolbarmenu.hxx>
 
 class XFillFloatTransparenceItem;
 
@@ -28,12 +29,10 @@ namespace svx::sidebar
 class AreaTransparencyGradientControl;
 class AreaPropertyPanelBase;
 
-class AreaTransparencyGradientPopup final
+class AreaTransparencyGradientPopup final : public WeldToolbarPopup
 {
 private:
     AreaPropertyPanelBase& mrAreaPropertyPanel;
-    std::unique_ptr<weld::Builder> mxBuilder;
-    std::unique_ptr<weld::Container> mxTopLevel;
     std::unique_ptr<weld::Widget> mxCenterGrid;
     std::unique_ptr<weld::Widget> mxAngleGrid;
     std::unique_ptr<weld::MetricSpinButton> mxMtrTrgrCenterX;
@@ -53,12 +52,12 @@ private:
     DECL_LINK(FocusHdl, weld::Widget&, void);
 
 public:
-    AreaTransparencyGradientPopup(AreaPropertyPanelBase& rPanel, weld::Widget* pParent);
+    AreaTransparencyGradientPopup(const css::uno::Reference<css::frame::XFrame>& rFrame,
+                                  AreaPropertyPanelBase& rPanel, weld::Widget* pParent);
     ~AreaTransparencyGradientPopup();
 
-    weld::Container* getTopLevel() const { return mxTopLevel.get(); }
-
     void Rearrange(XFillFloatTransparenceItem const* pItem);
+    virtual void GrabFocus() override;
 };
 
 } // end of namespace svx::sidebar