diff --git a/static/directives/create-entity-dialog.html b/static/directives/create-entity-dialog.html
index a3ef2d966..5e8bec9bf 100644
--- a/static/directives/create-entity-dialog.html
+++ b/static/directives/create-entity-dialog.html
@@ -29,7 +29,7 @@
                ng-if="entity"></div>
         </div>
         <div class="modal-body" ng-show="view == 'enterName'">
-          <form name="enterNameForm" ng-submit="createEntity()">
+          <form name="enterNameForm" ng-submit="enterNameForm.$valid && createEntity()">
             <label>Provide a name for your new {{ entityTitle }}:</label>
             <input type="text" class="form-control" ng-model="entityName" ng-pattern="entityNameRegexObj" required>
             <div class="help-text">