diff --git a/src/components/list/DomainInput.js b/src/components/list/DomainInput.js
index c6c1d9b..cbe1d4d 100644
--- a/src/components/list/DomainInput.js
+++ b/src/components/list/DomainInput.js
@@ -25,6 +25,12 @@ class DomainInput extends Component {
     e.preventDefault();
 
     const domain = this.state.domain;
+
+    // Don't do anything for empty inputs
+    if (domain.length === 0) {
+      return;
+    }
+
     const isValid = this.props.isValid(domain);
     this.setState({ isValid });
     if (isValid) {
diff --git a/src/components/list/DomainInput.test.js b/src/components/list/DomainInput.test.js
index 57a90b3..052c914 100644
--- a/src/components/list/DomainInput.test.js
+++ b/src/components/list/DomainInput.test.js
@@ -128,15 +128,15 @@ it("does not call onEnter when input is empty", () => {
     <DomainInput
       onEnter={onEnter}
       onRefresh={jest.fn()}
-      isValid={isValidDomain}
+      isValid={() => true}
       onValidationError={jest.fn()}
     />
   );
 
   wrapper
-    .find("button")
+    .find("form")
     .first()
-    .simulate("click");
+    .simulate("submit", { preventDefault: jest.fn() });
 
   expect(onEnter).not.toHaveBeenCalled();
 });