diff --git a/ui-admin/src/js/components/common/grid/Grid.jsx b/ui-admin/src/js/components/common/grid/Grid.jsx
index 963837ead92f9198970e4c59f11e4af1febdbeb0..6095de99c052edd162f0bee16eb1004398818e8e 100644
--- a/ui-admin/src/js/components/common/grid/Grid.jsx
+++ b/ui-admin/src/js/components/common/grid/Grid.jsx
@@ -238,6 +238,8 @@ class Grid extends React.PureComponent {
       return null
     }
 
+    const visibleColumns = this.controller.getVisibleColumns()
+
     return (
       <GridExports
         id={id}
@@ -246,6 +248,7 @@ class Grid extends React.PureComponent {
         exportOptions={exportOptions}
         multiselectable={multiselectable}
         multiselectedRows={multiselectedRows}
+        visibleColumns={visibleColumns}
         onExport={this.controller.handleExport}
         onExportOptionsChange={this.controller.handleExportOptionsChange}
       />
diff --git a/ui-admin/src/js/components/common/grid/GridExports.jsx b/ui-admin/src/js/components/common/grid/GridExports.jsx
index 9cb5dcede96bd88a3c46c111f716b1084cfc7970..78416767421f98bf77a2d861bdf35f8f2ca52f22 100644
--- a/ui-admin/src/js/components/common/grid/GridExports.jsx
+++ b/ui-admin/src/js/components/common/grid/GridExports.jsx
@@ -139,6 +139,7 @@ class GridExports extends React.PureComponent {
       disabled,
       multiselectable,
       multiselectedRows,
+      visibleColumns,
       classes
     } = this.props
     const { el, importCompatibleError } = this.state
@@ -315,8 +316,12 @@ class GridExports extends React.PureComponent {
                 label={messages.get(messages.EXPORT)}
                 type='neutral'
                 disabled={
-                  exportOptions.rows === GridExportOptions.ROWS.SELECTED_ROWS &&
-                  _.isEmpty(multiselectedRows)
+                  (exportOptions.columns ===
+                    GridExportOptions.COLUMNS.VISIBLE &&
+                    _.isEmpty(visibleColumns)) ||
+                  (exportOptions.rows ===
+                    GridExportOptions.ROWS.SELECTED_ROWS &&
+                    _.isEmpty(multiselectedRows))
                 }
                 onClick={this.handleExport}
               />