diff --git a/Core/src/org/sleuthkit/autopsy/discovery/ui/ArtifactsListPanel.java b/Core/src/org/sleuthkit/autopsy/discovery/ui/ArtifactsListPanel.java
index d1328ef68c..cbf38d7453 100644
--- a/Core/src/org/sleuthkit/autopsy/discovery/ui/ArtifactsListPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/discovery/ui/ArtifactsListPanel.java
@@ -162,8 +162,7 @@ final class ArtifactsListPanel extends AbstractArtifactListPanel {
     @ThreadConfined(type = ThreadConfined.ThreadType.AWT)
     @Override
     void clearList() {
-        tableModel.setContents(new ArrayList<>());
-        tableModel.fireTableDataChanged();
+        addArtifacts(new ArrayList<>());
     }
 
     /**
diff --git a/Core/src/org/sleuthkit/autopsy/discovery/ui/DomainDetailsPanel.java b/Core/src/org/sleuthkit/autopsy/discovery/ui/DomainDetailsPanel.java
index c50ab50020..496141b091 100644
--- a/Core/src/org/sleuthkit/autopsy/discovery/ui/DomainDetailsPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/discovery/ui/DomainDetailsPanel.java
@@ -80,9 +80,9 @@ final class DomainDetailsPanel extends JPanel {
                     if (selectedTabName == null || !selectedTabName.equals(newTabTitle)) {
                         selectedTabName = newTabTitle;
                         Component selectedComponent = jTabbedPane1.getSelectedComponent();
-                        if (selectedComponent instanceof DomainArtifactsTabPanel) {
+                        if (!StringUtils.isBlank(domain) && selectedComponent instanceof DomainArtifactsTabPanel) {
                             runDomainWorker((DomainArtifactsTabPanel) selectedComponent, true);
-                        } else if (selectedComponent instanceof MiniTimelinePanel) {
+                        } else if (!StringUtils.isBlank(domain) && selectedComponent instanceof MiniTimelinePanel) {
                             runMiniTimelineWorker((MiniTimelinePanel) selectedComponent, true);
                         }
                     }
@@ -170,13 +170,13 @@ final class DomainDetailsPanel extends JPanel {
     @Subscribe
     void handlePopulateDomainTabsEvent(DiscoveryEventUtils.PopulateDomainTabsEvent populateEvent) {
         SwingUtilities.invokeLater(() -> {
-            if (StringUtils.isBlank(populateEvent.getDomain())) {
+            domain = populateEvent.getDomain();
+            if (StringUtils.isBlank(domain)) {
                 resetTabsStatus();
                 //send fade out event
                 DiscoveryEventUtils.getDiscoveryEventBus().post(new DiscoveryEventUtils.DetailsVisibleEvent(false));
             } else {
                 resetTabsStatus();
-                domain = populateEvent.getDomain();
                 Component selectedComponent = jTabbedPane1.getSelectedComponent();
                 if (selectedComponent instanceof DomainArtifactsTabPanel) {
                     runDomainWorker((DomainArtifactsTabPanel) selectedComponent, false);