diff --git a/src/chrome/ExportDataPluginSheet.tsx b/src/chrome/ExportDataPluginSheet.tsx
index c82f299bb..bb192a8fc 100644
--- a/src/chrome/ExportDataPluginSheet.tsx
+++ b/src/chrome/ExportDataPluginSheet.tsx
@@ -76,12 +76,6 @@ class ExportDataPluginSheet extends Component<Props, State> {
     };
   }
 
-  componentDidMount() {
-    if (this.props.plugins.selectedPlugins.length <= 0) {
-      this.props.setSelectedPlugins(this.state.availablePluginsToExport);
-    }
-  }
-
   render() {
     const {onHide} = this.props;
     const onHideWithUnsettingShare = () => {
@@ -119,13 +113,7 @@ class ExportDataPluginSheet extends Component<Props, State> {
             }
           }}
           onChange={selectedArray => {
-            if (selectedArray.length > 0) {
-              this.props.setSelectedPlugins(selectedArray);
-            } else {
-              this.props.setSelectedPlugins(
-                this.state.availablePluginsToExport,
-              );
-            }
+            this.props.setSelectedPlugins(selectedArray);
           }}
           elements={this.state.availablePluginsToExport}
           selectedElements={new Set(this.props.plugins.selectedPlugins)}
diff --git a/src/chrome/ListView.tsx b/src/chrome/ListView.tsx
index b3ad0a7b6..4b5a4efc0 100644
--- a/src/chrome/ListView.tsx
+++ b/src/chrome/ListView.tsx
@@ -17,6 +17,7 @@ import {
   Checkbox,
   colors,
   View,
+  Tooltip,
 } from '../ui';
 import React, {Component} from 'react';
 
@@ -169,9 +170,22 @@ export default class ListView extends Component<Props, State> {
               <Button compact padded onClick={this.props.onHide}>
                 Close
               </Button>
-              <Button compact padded type="primary" onClick={onSubmit}>
-                Submit
-              </Button>
+              <Tooltip
+                title={
+                  this.state.selectedElements.size <= 0
+                    ? `Please select atleast one plugin`
+                    : null
+                }
+                options={{position: 'toRight'}}>
+                <Button
+                  compact
+                  padded
+                  type="primary"
+                  onClick={onSubmit}
+                  disabled={this.state.selectedElements.size <= 0}>
+                  Submit
+                </Button>
+              </Tooltip>
             </FlexRow>
           </Padder>
         )}