diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/DropdownSearchPanel.form b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/DropdownSearchPanel.form
index c39d755ed0..8010b42de6 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/DropdownSearchPanel.form
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/DropdownSearchPanel.form
@@ -118,6 +118,10 @@
           <Dimension value="[2, 25]"/>
         </Property>
       </Properties>
+      <Events>
+        <EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="keywordTextFieldMouseClicked"/>
+        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="keywordTextFieldActionPerformed"/>
+      </Events>
     </Component>
     <Component class="javax.swing.JButton" name="searchButton">
       <Properties>
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/DropdownSearchPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/DropdownSearchPanel.java
index b5f686a918..a850746681 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/DropdownSearchPanel.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/DropdownSearchPanel.java
@@ -181,6 +181,16 @@ public class DropdownSearchPanel extends AbstractKeywordSearchPerformer {
         keywordTextField.setBorder(new javax.swing.border.LineBorder(new java.awt.Color(192, 192, 192), 1, true));
         keywordTextField.setMinimumSize(new java.awt.Dimension(2, 25));
         keywordTextField.setPreferredSize(new java.awt.Dimension(2, 25));
+        keywordTextField.addMouseListener(new java.awt.event.MouseAdapter() {
+            public void mouseClicked(java.awt.event.MouseEvent evt) {
+                keywordTextFieldMouseClicked(evt);
+            }
+        });
+        keywordTextField.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                keywordTextFieldActionPerformed(evt);
+            }
+        });
 
         searchButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/search-icon.png"))); // NOI18N
         org.openide.awt.Mnemonics.setLocalizedText(searchButton, org.openide.util.NbBundle.getMessage(DropdownSearchPanel.class, "DropdownSearchPanel.searchButton.text")); // NOI18N
@@ -239,6 +249,24 @@ public class DropdownSearchPanel extends AbstractKeywordSearchPerformer {
         keywordTextFieldActionPerformed(evt);
     }//GEN-LAST:event_searchButtonActionPerformed
 
+    private void keywordTextFieldActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_keywordTextFieldActionPerformed
+//        if (!entered) {
+//            return;
+//        }
+        //getRootPane().setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
+        try {
+            search();
+        } finally {
+            //getRootPane().setCursor(null);
+        }
+    }//GEN-LAST:event_keywordTextFieldActionPerformed
+
+    private void keywordTextFieldMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_keywordTextFieldMouseClicked
+        if(evt.isPopupTrigger()) {
+            rightClickMenu.show(evt.getComponent(), evt.getX(), evt.getY());
+        }
+    }//GEN-LAST:event_keywordTextFieldMouseClicked
+
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private javax.swing.JMenuItem copyMenuItem;
     private javax.swing.JMenuItem cutMenuItem;
@@ -252,18 +280,6 @@ public class DropdownSearchPanel extends AbstractKeywordSearchPerformer {
     private javax.swing.JMenuItem selectAllMenuItem;
     private javax.swing.JRadioButton substringRadioButton;
     // End of variables declaration//GEN-END:variables
-
-    private void keywordTextFieldActionPerformed(java.awt.event.ActionEvent evt) {                                          
-//        if (!entered) {
-//            return;
-//        }
-        //getRootPane().setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
-        try {
-            search();
-        } finally {
-            //getRootPane().setCursor(null);
-        }
-    }  
-    
+  
  
 }
\ No newline at end of file