diff --git a/artemis-console-extension/artemis-extension/src/artemis-extension/artemis/brokers/BrokerDiagram.tsx b/artemis-console-extension/artemis-extension/src/artemis-extension/artemis/brokers/BrokerDiagram.tsx
index 2fe0368..ef1f436 100644
--- a/artemis-console-extension/artemis-extension/src/artemis-extension/artemis/brokers/BrokerDiagram.tsx
+++ b/artemis-console-extension/artemis-extension/src/artemis-extension/artemis/brokers/BrokerDiagram.tsx
@@ -578,6 +578,11 @@ export const BrokerDiagram: React.FunctionComponent = () => {
         onClear={() => {
           onSearchTextChange('');
         }}
+        onKeyDown={(e) => {
+          if (e.key === 'Enter') {
+            setTopologyLoaded(false);
+          }
+        }}
       />
 
     </ToolbarItem>
diff --git a/artemis-console-extension/artemis-extension/src/artemis-extension/artemis/messages/MessagesTable.tsx b/artemis-console-extension/artemis-extension/src/artemis-extension/artemis/messages/MessagesTable.tsx
index 5c8cf4e..87f457c 100644
--- a/artemis-console-extension/artemis-extension/src/artemis-extension/artemis/messages/MessagesTable.tsx
+++ b/artemis-console-extension/artemis-extension/src/artemis-extension/artemis/messages/MessagesTable.tsx
@@ -322,6 +322,11 @@ export const MessagesTable: React.FunctionComponent<MessageProps> = props => {
                 onSearchTextChange('');
                 applyFilter();
               }}
+              onKeyDown={(e) => {
+                if (e.key === 'Enter') {
+                  applyFilter();
+                }
+              }}
             />
           </ToolbarItem>
           <ToolbarItem>
diff --git a/artemis-console-extension/artemis-extension/src/artemis-extension/artemis/table/ArtemisTable.tsx b/artemis-console-extension/artemis-extension/src/artemis-extension/artemis/table/ArtemisTable.tsx
index 6fd3e80..59799f3 100644
--- a/artemis-console-extension/artemis-extension/src/artemis-extension/artemis/table/ArtemisTable.tsx
+++ b/artemis-console-extension/artemis-extension/src/artemis-extension/artemis/table/ArtemisTable.tsx
@@ -413,6 +413,11 @@ const operationOptions = [
                 onSearchTextChange('');
                 applyFilter();
               }}
+              onKeyDown={(e) => {
+                if (e.key === 'Enter') {
+                  applyFilter();
+                }
+              }}
             />
           </ToolbarItem>
           <ToolbarItem key="search-button">