diff --git a/components/advanced/ResultsDownload.vue b/components/advanced/ResultsDownload.vue
index b095a6e..97c3d92 100644
--- a/components/advanced/ResultsDownload.vue
+++ b/components/advanced/ResultsDownload.vue
@@ -5,6 +5,7 @@
       <template v-slot:activator="{ on, attrs }">
         <v-btn elevation="0" small
                v-bind="attrs"
+               :disabled="disabled"
                @click="downloadFile('csv')"
                v-on="on"
         >
@@ -22,6 +23,7 @@
       <template v-slot:activator="{ on, attrs }">
         <v-btn elevation="0" small
                v-bind="attrs"
+               :disabled="disabled"
                @click="downloadFile('tsv')"
                v-on="on"
         >
@@ -43,6 +45,12 @@ import {mdiFileDelimited, mdiFileExcel, mdiKeyboardTab} from "@mdi/js";
 
 export default Vue.extend({
   name: "ResultsDownload",
+  props: {
+    disabled: {
+      type: Boolean,
+      default: false
+    }
+  },
   data: () => ({
     mdiFileDelimitedSvg: mdiFileDelimited,
     mdiKeyboardTabSvg: mdiKeyboardTab,
diff --git a/components/advanced/ResultsTable.vue b/components/advanced/ResultsTable.vue
index 9fea3e0..bda70de 100644
--- a/components/advanced/ResultsTable.vue
+++ b/components/advanced/ResultsTable.vue
@@ -42,9 +42,9 @@
         <!--        style="max-width: 300px;"-->
         <!--      ></v-text-field>-->
 
-        <ResultsDownload></ResultsDownload>
+        <ResultsDownload :disabled="totalNumberOfItems === 0"></ResultsDownload>
 
-        <NcbiGenomesDownload></NcbiGenomesDownload>
+        <NcbiGenomesDownload :disabled="totalNumberOfItems === 0"></NcbiGenomesDownload>
 
       </v-row>
     </v-card-title>
@@ -176,7 +176,7 @@ export default Vue.extend({
         this.$accessor.advanced.SET_RESULTS_SORT_DESC(value)
       }
     },
-    totalNumberOfItems() {
+    totalNumberOfItems(): number {
       return this.$accessor.advanced.results == null ? 0 : this.$accessor.advanced.results.rows.length
     },
     searchHasBeenRun() {
diff --git a/components/util/NcbiGenomesDownload.vue b/components/util/NcbiGenomesDownload.vue
index d012e2b..eae45ce 100644
--- a/components/util/NcbiGenomesDownload.vue
+++ b/components/util/NcbiGenomesDownload.vue
@@ -4,8 +4,10 @@
       <v-btn
         elevation="0"
         small
+        style="margin-top: 2px; margin-left: 6px;"
         v-bind="attrs"
         @click="dialog = !dialog"
+        :disabled="disabled"
         v-on="on"
       >
         Genomes
@@ -96,6 +98,12 @@ import Vue from 'vue';
 import {mdiDownload} from '@mdi/js';
 
 export default Vue.extend({
+  props: {
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
+  },
   data: () => ({
     mdiDownloadSvg: mdiDownload,
     dialog: false,