diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchEditListPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchEditListPanel.java
index 499ccf81f5..91846cdb8d 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchEditListPanel.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchEditListPanel.java
@@ -786,7 +786,7 @@ class KeywordSearchEditListPanel extends javax.swing.JPanel implements ListSelec
 
         List<Keyword> getSelectedKeywords(int[] selected) {
             List<Keyword> ret = new ArrayList<Keyword>();
-            Keyword[] in = keywordData.toArray(new Keyword[0]);
+            Keyword[] in = keywordData.toArray(new Keyword[keywordData.size()]);
             for (int i = 0; i < selected.length; i++) {
                 ret.add(in[selected[i]]);
             }
@@ -832,9 +832,9 @@ class KeywordSearchEditListPanel extends javax.swing.JPanel implements ListSelec
         //delete selected from handle, events are fired from the handle
         void deleteSelected(int[] selected) {
             List<TableEntry> toDel = new ArrayList<TableEntry>();
-            Keyword[] in = keywordData.toArray(new Keyword[0]);
+            TableEntry [] in = keywordData.toArray(new TableEntry[keywordData.size()]);
             for (int i = 0; i < selected.length; i++) {
-                Keyword word = in[selected[i]];
+                Keyword word = in[selected[i]].keyword;
                 toDel.add(new TableEntry(word));
             }
             for (TableEntry del : toDel) {