diff --git a/dbaccess/UIConfig_dbbrowser.mk b/dbaccess/UIConfig_dbbrowser.mk
index 94f9c9fb8df4..421312d20c0b 100644
--- a/dbaccess/UIConfig_dbbrowser.mk
+++ b/dbaccess/UIConfig_dbbrowser.mk
@@ -13,6 +13,10 @@ $(eval $(call gb_UIConfig_add_menubarfiles,modules/dbbrowser,\
 	dbaccess/uiconfig/dbbrowser/menubar/compat \
 ))
 
+$(eval $(call gb_UIConfig_add_popupmenufiles,modules/dbbrowser,\
+	dbaccess/uiconfig/dbbrowser/popupmenu/refreshdata \
+))
+
 $(eval $(call gb_UIConfig_add_toolbarfiles,modules/dbbrowser,\
 	dbaccess/uiconfig/dbbrowser/toolbar/toolbar \
 ))
diff --git a/dbaccess/UIConfig_dbtdata.mk b/dbaccess/UIConfig_dbtdata.mk
index 6fe0a8538ac2..2f8cb3f6263d 100644
--- a/dbaccess/UIConfig_dbtdata.mk
+++ b/dbaccess/UIConfig_dbtdata.mk
@@ -13,6 +13,10 @@ $(eval $(call gb_UIConfig_add_menubarfiles,modules/dbtdata,\
 	dbaccess/uiconfig/dbtdata/menubar/menubar \
 ))
 
+$(eval $(call gb_UIConfig_add_popupmenufiles,modules/dbtdata,\
+	dbaccess/uiconfig/dbtdata/popupmenu/refreshdata \
+))
+
 $(eval $(call gb_UIConfig_add_toolbarfiles,modules/dbtdata,\
 	dbaccess/uiconfig/dbtdata/toolbar/toolbar \
 ))
diff --git a/dbaccess/source/ui/browser/sbabrw.src b/dbaccess/source/ui/browser/sbabrw.src
index 0aba65fa1b93..e5fdae7abe53 100644
--- a/dbaccess/source/ui/browser/sbabrw.src
+++ b/dbaccess/source/ui/browser/sbabrw.src
@@ -143,23 +143,4 @@ String STR_COULDNOTCONNECT_DATASOURCE
     Text [ en-US ] = "The connection to the data source \"$name$\" could not be established.";
 };
 
-Menu RID_MENU_REFRESH_DATA
-{
-    ItemList =
-    {
-        MenuItem
-        {
-            Identifier = ID_BROWSER_REFRESH ;
-            Text [ en-US ] = "Refresh";
-            Command = ".uno:Refresh";
-        };
-        MenuItem
-        {
-            Identifier = ID_BROWSER_REFRESH_REBUILD;
-            Command = ".uno:DBRebuildData";
-            Text [ en-US ] = "Rebuild";
-        };
-    };
-};
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/uiconfig/dbbrowser/popupmenu/refreshdata.xml b/dbaccess/uiconfig/dbbrowser/popupmenu/refreshdata.xml
new file mode 100644
index 000000000000..216c6c53cb89
--- /dev/null
+++ b/dbaccess/uiconfig/dbbrowser/popupmenu/refreshdata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+-->
+<menu:menupopup xmlns:menu="http://openoffice.org/2001/menu">
+  <menu:menuitem menu:id=".uno:Refresh"/>
+  <menu:menuitem menu:id=".uno:DBRebuildData"/>
+</menu:menupopup>
diff --git a/dbaccess/uiconfig/dbtdata/popupmenu/refreshdata.xml b/dbaccess/uiconfig/dbtdata/popupmenu/refreshdata.xml
new file mode 100644
index 000000000000..216c6c53cb89
--- /dev/null
+++ b/dbaccess/uiconfig/dbtdata/popupmenu/refreshdata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+-->
+<menu:menupopup xmlns:menu="http://openoffice.org/2001/menu">
+  <menu:menuitem menu:id=".uno:Refresh"/>
+  <menu:menuitem menu:id=".uno:DBRebuildData"/>
+</menu:menupopup>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
index 4ef4e4bc1572..f6b1eebd8f66 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
@@ -411,6 +411,20 @@
           <value>new</value>
         </prop>
       </node>
+      <node oor:name="c34" oor:op="replace">
+        <prop oor:name="Command">
+          <value>.uno:DBRefreshMenu</value>
+        </prop>
+        <prop oor:name="Module">
+          <value/>
+        </prop>
+        <prop oor:name="Controller">
+          <value>com.sun.star.comp.framework.ResourceMenuController</value>
+        </prop>
+        <prop oor:name="Value">
+          <value>refreshdata</value>
+        </prop>
+      </node>
     </node>
     <node oor:name="ToolBar">
       <node oor:name="ZoomToolBox" oor:op="replace">
@@ -723,7 +737,10 @@
           <value>com.sun.star.sdb.OfficeDatabaseDocument</value>
         </prop>
         <prop oor:name="Controller">
-          <value>com.sun.star.sdb.ApplicationToolboxController</value>
+          <value>com.sun.star.comp.framework.GenericPopupToolbarController</value>
+        </prop>
+        <prop oor:name="Value">
+          <value>.uno:DBRefreshMenu;1</value>
         </prop>
       </node>
       <node oor:name="c13" oor:op="replace">
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DbuCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DbuCommands.xcu
index 81deeef828ee..3c44bef4cf49 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DbuCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DbuCommands.xcu
@@ -515,6 +515,11 @@
           <value xml:lang="en-US">Preview</value>
         </prop>
       </node>
+      <node oor:name=".uno:DBRebuildData" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Rebuild</value>
+        </prop>
+      </node>
       <node oor:name=".uno:DBNewReport" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Report...</value>