diff --git a/zap/src/main/java/org/zaproxy/zap/extension/search/ExtensionSearch.java b/zap/src/main/java/org/zaproxy/zap/extension/search/ExtensionSearch.java
index 898a05d2088..52a421bccad 100644
--- a/zap/src/main/java/org/zaproxy/zap/extension/search/ExtensionSearch.java
+++ b/zap/src/main/java/org/zaproxy/zap/extension/search/ExtensionSearch.java
@@ -399,7 +399,7 @@ public void sessionScopeChanged(Session session) {
         @Override
         public void sessionChanged(final Session session) {
             if (EventQueue.isDispatchThread()) {
-                getSearchPanel().resetSearchResults();
+                getSearchPanel().reset();
                 return;
             }
 
diff --git a/zap/src/main/java/org/zaproxy/zap/extension/search/SearchPanel.java b/zap/src/main/java/org/zaproxy/zap/extension/search/SearchPanel.java
index c845e7b7a32..380e9e2bd95 100644
--- a/zap/src/main/java/org/zaproxy/zap/extension/search/SearchPanel.java
+++ b/zap/src/main/java/org/zaproxy/zap/extension/search/SearchPanel.java
@@ -421,6 +421,13 @@ private JScrollPane getJScrollPane() {
         return jScrollPane;
     }
 
+    void reset() {
+        resetSearchResults();
+
+        getRegExField().setText("");
+        getRegExField().discardAllEdits();
+    }
+
     public void resetSearchResults() {
         setNumberOfMatches(0);
         resultsModel.clear();