diff --git a/plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java b/plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java
index 62e41efb2417e0fbc01c5f187a82fadc7087a8e6..45c8dfba5f9fe7079c965bab0f4ac9cc3dae265e 100644
--- a/plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java
+++ b/plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java
@@ -2464,22 +2464,20 @@ public class ResultSetViewer extends Viewer
         final DBSDataContainer dataContainer = getDataContainer();
 
         // Fill general menu
-        if (row != null && dataContainer != null && model.hasData()) {
+        if (dataContainer != null) {
             manager.add(ActionUtils.makeCommandContribution(site, ResultSetHandlerMain.CMD_EXPORT));
             MenuManager openWithMenu = new MenuManager(ActionUtils.findCommandName(ResultSetHandlerOpenWith.CMD_OPEN_WITH));
             openWithMenu.setRemoveAllWhenShown(true);
             openWithMenu.addMenuListener(manager1 -> ResultSetHandlerOpenWith.fillOpenWithMenu(ResultSetViewer.this, manager1));
             manager.add(openWithMenu);
-        }
 
-        if (attr != null && row != null) {
             manager.add(new GroupMarker(NavigatorCommands.GROUP_TOOLS));
             manager.add(new GroupMarker(MENU_GROUP_EXPORT));
         }
 
         manager.add(new Separator(MENU_GROUP_ADDITIONS));
 
-        if (dataContainer != null && model.hasData()) {
+        if (dataContainer != null) {
             manager.add(new Separator());
             manager.add(ActionUtils.makeCommandContribution(site, IWorkbenchCommandConstants.FILE_REFRESH));
         }