diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/survey/SurveysView.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/survey/SurveysView.java
index 006d6e68767..0eb91c532e5 100644
--- a/sormas-ui/src/main/java/de/symeda/sormas/ui/survey/SurveysView.java
+++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/survey/SurveysView.java
@@ -30,7 +30,10 @@ public SurveysView() {
 		viewConfiguration = ViewModelProviders.of(getClass()).get(ViewConfiguration.class);
 		criteria = ViewModelProviders.of(SurveysView.class).get(SurveyCriteria.class);
 
-		gridComponent = new SurveyGridComponent(criteria, viewConfiguration, () -> navigateTo(criteria, true), () -> navigateTo(null, true));
+		gridComponent = new SurveyGridComponent(criteria, viewConfiguration, () -> navigateTo(criteria, true), () -> {
+			ViewModelProviders.of(SurveysView.class).remove(SurveyCriteria.class);
+			navigateTo(null, true);
+		});
 		addComponent(gridComponent);
 
 		if (UiUtil.permitted(UserRight.SURVEY_CREATE)) {
@@ -47,6 +50,9 @@ public void enter(ViewChangeListener.ViewChangeEvent event) {
 		if (params.startsWith("?")) {
 			params = params.substring(1);
 			criteria.fromUrlParams(params);
+		} else {
+			criteria.setFreeText(null);
+			criteria.setDisease(null);
 		}
 		setApplyingCriteria(true);
 		gridComponent.updateFilterComponents(criteria);
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/utils/components/ApplyResetButtonsComponent.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/utils/components/ApplyResetButtonsComponent.java
index 7311ca60060..b09378bf285 100644
--- a/sormas-ui/src/main/java/de/symeda/sormas/ui/utils/components/ApplyResetButtonsComponent.java
+++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/utils/components/ApplyResetButtonsComponent.java
@@ -19,12 +19,12 @@ public class ApplyResetButtonsComponent extends HorizontalLayout {
 	public ApplyResetButtonsComponent(String applyCaptionTag, String resetCaptionTag) {
 		setSpacing(false);
 
-		resetButton = ButtonHelper.createButton(resetCaptionTag, null, FILTER_ITEM_STYLE);
-		addComponent(resetButton);
-
 		applyButton = ButtonHelper.createButton(applyCaptionTag, null, FILTER_ITEM_STYLE);
 		applyButton.setClickShortcut(ShortcutAction.KeyCode.ENTER);
 		addComponent(applyButton);
+
+		resetButton = ButtonHelper.createButton(resetCaptionTag, null, FILTER_ITEM_STYLE);
+		addComponent(resetButton);
 	}
 
 	public void addApplyHandler(Button.ClickListener applyHandler) {