diff --git a/src/app/ModuleBrowser.cpp b/src/app/ModuleBrowser.cpp
index 0de8ce16..fd361598 100644
--- a/src/app/ModuleBrowser.cpp
+++ b/src/app/ModuleBrowser.cpp
@@ -365,6 +365,12 @@ struct ModuleBrowser : VirtualWidget {
 		moduleList->clearChildren();
 		moduleList->selected = 0;
 
+		// Clear filter
+		if (!(sAuthorFilter.empty() && sTagFilter == NO_TAG)) {
+			ClearFilterItem *item = new ClearFilterItem();
+			moduleList->addChild(item);
+		}
+
 		// Favorites
 		if (!sFavoriteModels.empty()) {
 			SeparatorItem *item = new SeparatorItem();
@@ -379,7 +385,7 @@ struct ModuleBrowser : VirtualWidget {
 			}
 		}
 
-		// Authors
+		// Author/tag subpage
 		if (sAuthorFilter.empty() && sTagFilter == NO_TAG) {
 			// Author items
 			{
@@ -408,10 +414,6 @@ struct ModuleBrowser : VirtualWidget {
 				}
 			}
 		}
-		else {
-			ClearFilterItem *item = new ClearFilterItem();
-			moduleList->addChild(item);
-		}
 
 		// Models
 		if (!sAuthorFilter.empty() || sTagFilter != NO_TAG || !search.empty()) {