diff --git a/ui/lib/core/addon/components/filter-input-explicit.hbs b/ui/lib/core/addon/components/filter-input-explicit.hbs
index 28e27a02e85d..2cf1f2ed2935 100644
--- a/ui/lib/core/addon/components/filter-input-explicit.hbs
+++ b/ui/lib/core/addon/components/filter-input-explicit.hbs
@@ -3,7 +3,7 @@
   SPDX-License-Identifier: BUSL-1.1
 ~}}
 
-<div>
+<form {{on "submit" @handleSearch}}>
   <Hds::SegmentedGroup as |S|>
     <S.TextInput
       @value={{@query}}
@@ -14,13 +14,6 @@
       {{on "keydown" @handleKeyDown}}
       data-test-filter-input-explicit
     />
-    <S.Button
-      @color="secondary"
-      @text="Search"
-      @icon="search"
-      type="submit"
-      {{on "click" @handleSearch}}
-      data-test-filter-input-explicit-search
-    />
+    <S.Button @color="secondary" @text="Search" @icon="search" type="submit" data-test-filter-input-explicit-search />
   </Hds::SegmentedGroup>
-</div>
\ No newline at end of file
+</form>
\ No newline at end of file
diff --git a/ui/tests/integration/components/filter-input-explicit-test.js b/ui/tests/integration/components/filter-input-explicit-test.js
index 77dafb9cb1e0..3dff54736c44 100644
--- a/ui/tests/integration/components/filter-input-explicit-test.js
+++ b/ui/tests/integration/components/filter-input-explicit-test.js
@@ -10,11 +10,17 @@ import hbs from 'htmlbars-inline-precompile';
 import { GENERAL } from 'vault/tests/helpers/general-selectors';
 import sinon from 'sinon';
 
+const handler = (e) => {
+  // required because filter-input-explicit passes handleSearch on form submit
+  if (e && e.preventDefault) e.preventDefault();
+  return;
+};
+
 module('Integration | Component | filter-input-explicit', function (hooks) {
   setupRenderingTest(hooks);
 
   hooks.beforeEach(function () {
-    this.handleSearch = sinon.spy();
+    this.handleSearch = sinon.spy(handler);
     this.handleInput = sinon.spy();
     this.handleKeyDown = sinon.spy();
     this.query = '';