diff --git a/src/Squidex/app/shared/components/search-form.component.html b/src/Squidex/app/shared/components/search-form.component.html
index 13a9d7ef7..f3bbc7734 100644
--- a/src/Squidex/app/shared/components/search-form.component.html
+++ b/src/Squidex/app/shared/components/search-form.component.html
@@ -91,9 +91,9 @@
             </ng-container>
         
             <ng-container footer>
-                <button type="reset" class="float-left btn btn-secondary" (click)="saveQueryComplete()" [disabled]="saveQueryForm.submitted | async">Cancel</button>
+                <button type="reset" class="float-left btn btn-secondary" (click)="saveQueryDialog.hide()" [disabled]="saveQueryForm.submitted | async">Cancel</button>
                 <button type="submit" class="float-right btn btn-success">Create</button>
             </ng-container>
         </sqx-modal-dialog>
     </form>
-</ng-container>
\ No newline at end of file
+</ng-container>
diff --git a/src/Squidex/app/shared/components/search-form.component.ts b/src/Squidex/app/shared/components/search-form.component.ts
index 5b76a7de7..60432aa90 100644
--- a/src/Squidex/app/shared/components/search-form.component.ts
+++ b/src/Squidex/app/shared/components/search-form.component.ts
@@ -90,6 +90,7 @@ export class SearchFormComponent implements OnChanges, OnInit {
     }
 
     public saveQuery() {
+        this.saveQueryForm.submitCompleted({});
         this.saveQueryDialog.show();
     }
 
@@ -186,4 +187,4 @@ export class SearchFormComponent implements OnChanges, OnInit {
 
         this.contentsFilter.setValue(query);
     }
-}
\ No newline at end of file
+}