diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchEditListPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchEditListPanel.java
index 6fe110bd4b..eb866831b9 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchEditListPanel.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchEditListPanel.java
@@ -671,6 +671,7 @@ class KeywordSearchEditListPanel extends javax.swing.JPanel implements ListSelec
             tableModel.resync(currentKeywordList);
             initButtons();
         } else {
+            currentKeywordList = null;
             tableModel.deleteAll();
             initButtons();
         }
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsManagementPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsManagementPanel.java
index 03e5ba8eef..40953dfc8c 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsManagementPanel.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsManagementPanel.java
@@ -363,7 +363,7 @@ class KeywordSearchListsManagementPanel extends javax.swing.JPanel {
             fireTableDataChanged();
         }
 
-        //resync single model entry from handle, then update table
+        //resync single model entry from handle
         void resync(String listName) {
             TableEntry found = null;
             for (TableEntry e : listData) {
@@ -376,7 +376,6 @@ class KeywordSearchListsManagementPanel extends javax.swing.JPanel {
                 listData.remove(found);
                 addList(listsHandle.getList(listName));
             }
-            fireTableDataChanged();
         }
 
         //add list to the model