diff --git a/Core/src/org/sleuthkit/autopsy/filequery/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/filequery/Bundle.properties-MERGED
index fca2e3e191..b947682e5b 100644
--- a/Core/src/org/sleuthkit/autopsy/filequery/Bundle.properties-MERGED
+++ b/Core/src/org/sleuthkit/autopsy/filequery/Bundle.properties-MERGED
@@ -28,7 +28,7 @@ FileSearchData.FileSize.OVER_100KB.displayName=100 KB - 1 MB
 FileSearchData.FileSize.OVER_10GB.displayName=10 GB+
 FileSearchData.FileSize.OVER_16KB.displayName=16 KB - 100 KB
 FileSearchData.FileSize.OVER_1GB_IMAGE.displayName=1 GB+
-FileSearchData.FileSize.OVER_1GB_VIDEO.displayName=\ 1 - 5 GB
+FileSearchData.FileSize.OVER_1GB_VIDEO.displayName=1 - 5 GB
 FileSearchData.FileSize.OVER_1MB.displayName=1 - 50 MB
 FileSearchData.FileSize.OVER_200MB.displayName=200 MB - 1 GB
 FileSearchData.FileSize.OVER_50MB.displayName=50 - 200 MB
diff --git a/Core/src/org/sleuthkit/autopsy/filequery/DiscoveryTopComponent.java b/Core/src/org/sleuthkit/autopsy/filequery/DiscoveryTopComponent.java
index ad6f4c45c6..4a4060410a 100644
--- a/Core/src/org/sleuthkit/autopsy/filequery/DiscoveryTopComponent.java
+++ b/Core/src/org/sleuthkit/autopsy/filequery/DiscoveryTopComponent.java
@@ -32,6 +32,7 @@ import org.sleuthkit.autopsy.corecomponents.DataContentPanel;
 import org.sleuthkit.autopsy.corecomponents.TableFilterNode;
 import org.sleuthkit.autopsy.coreutils.ThreadConfined;
 import org.sleuthkit.autopsy.datamodel.FileNode;
+import org.sleuthkit.autopsy.filequery.FileSearchData.FileType;
 import org.sleuthkit.datamodel.AbstractFile;
 
 /**
@@ -276,8 +277,11 @@ public final class DiscoveryTopComponent extends TopComponent {
     @Subscribe
     void handleSearchCancelledEvent(DiscoveryEvents.SearchCancelledEvent searchCancelledEvent) {
         SwingUtilities.invokeLater(() -> {
-            imagesButton.setEnabled(true);
-            videosButton.setEnabled(true);
+            if (fileSearchPanel.getSelectedType() == FileType.VIDEO) {
+                imagesButton.setEnabled(true);
+            } else if (fileSearchPanel.getSelectedType() == FileType.IMAGE) {
+                videosButton.setEnabled(true);
+            }
         });
     }
 
@@ -289,8 +293,11 @@ public final class DiscoveryTopComponent extends TopComponent {
     @Subscribe
     void handleSearchCompletedEvent(DiscoveryEvents.SearchCompleteEvent searchCompletedEvent) {
         SwingUtilities.invokeLater(() -> {
-            imagesButton.setEnabled(true);
-            videosButton.setEnabled(true);
+            if (fileSearchPanel.getSelectedType() == FileType.VIDEO) {
+                imagesButton.setEnabled(true);
+            } else if (fileSearchPanel.getSelectedType() == FileType.IMAGE) {
+                videosButton.setEnabled(true);
+            }
         });
     }
 
diff --git a/Core/src/org/sleuthkit/autopsy/filequery/FileSearchData.java b/Core/src/org/sleuthkit/autopsy/filequery/FileSearchData.java
index c123f305b2..1859a45126 100644
--- a/Core/src/org/sleuthkit/autopsy/filequery/FileSearchData.java
+++ b/Core/src/org/sleuthkit/autopsy/filequery/FileSearchData.java
@@ -138,7 +138,7 @@ class FileSearchData {
     @NbBundle.Messages({
         "FileSearchData.FileSize.OVER_10GB.displayName=10 GB+",
         "FileSearchData.FileSize.OVER_5GB.displayName=5 - 10 GB",
-        "FileSearchData.FileSize.OVER_1GB_VIDEO.displayName= 1 - 5 GB",
+        "FileSearchData.FileSize.OVER_1GB_VIDEO.displayName=1 - 5 GB",
         "FileSearchData.FileSize.OVER_1GB_IMAGE.displayName=1 GB+",
         "FileSearchData.FileSize.OVER_200MB.displayName=200 MB - 1 GB",
         "FileSearchData.FileSize.OVER_50MB.displayName=50 - 200 MB",
diff --git a/Core/src/org/sleuthkit/autopsy/filequery/FileSearchPanel.java b/Core/src/org/sleuthkit/autopsy/filequery/FileSearchPanel.java
index f32b1d8f1e..0346916d1c 100644
--- a/Core/src/org/sleuthkit/autopsy/filequery/FileSearchPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/filequery/FileSearchPanel.java
@@ -519,6 +519,10 @@ final class FileSearchPanel extends javax.swing.JPanel implements ActionListener
         validateFields();
     }
 
+    FileType getSelectedType(){
+        return fileType;
+    }
+    
     /**
      * Reset the panel to its initial configuration.
      */