diff --git a/src/modules/main_menu/components/menu-container.vue b/src/modules/main_menu/components/menu-container.vue
index 16a2844e..6cac23f2 100644
--- a/src/modules/main_menu/components/menu-container.vue
+++ b/src/modules/main_menu/components/menu-container.vue
@@ -61,19 +61,6 @@ export default {
 			if ( item.no_filter )
 				return true;
 
-			if ( this.context.simple_view ) {
-				// Don't hide any add-on settings in simple view
-				if ( item.path && item.path.startsWith('Add-Ons') )
-					return true;
-				for(const key of ['tabs', 'contents', 'items'])
-					if ( item[key] )
-						for(const thing of item[key])
-							if ( this.shouldShow(thing) )
-								return true;
-				if ( ! item.setting || ! item.simple )
-					return false;
-			}
-
 			if ( ! this.filter )
 				return true;
 
diff --git a/src/modules/main_menu/components/menu-page.vue b/src/modules/main_menu/components/menu-page.vue
index ec74aacd..fa4cd420 100644
--- a/src/modules/main_menu/components/menu-page.vue
+++ b/src/modules/main_menu/components/menu-page.vue
@@ -190,19 +190,6 @@ export default {
 			if ( item.no_filter )
 				return true;
 
-			if ( this.context.simple_view ) {
-				// Don't hide any add-on settings in simple view
-				if ( item.path && item.path.startsWith('Add-Ons') )
-					return true;
-				for(const key of ['tabs', 'contents', 'items'])
-					if ( item[key] )
-						for(const thing of item[key])
-							if ( this.shouldShow(thing) )
-								return true;
-				if ( ! item.setting || ! item.simple )
-					return false;
-			}
-
 			if ( ! this.filter )
 				return true;
 
diff --git a/src/modules/main_menu/components/menu-tree.vue b/src/modules/main_menu/components/menu-tree.vue
index 20aa5f40..a28f6eef 100644
--- a/src/modules/main_menu/components/menu-tree.vue
+++ b/src/modules/main_menu/components/menu-tree.vue
@@ -115,19 +115,6 @@ export default {
 			if ( item.no_filter )
 				return true;
 
-			if ( this.context.simple_view ) {
-				// Don't hide any add-on settings in simple view
-				if ( item.path && item.path.startsWith('Add-Ons') )
-					return true;
-				for(const key of ['tabs', 'contents', 'items'])
-					if ( item[key] )
-						for(const thing of item[key])
-							if ( this.shouldShow(thing) )
-								return true;
-				if ( ! item.setting || ! item.simple )
-					return false;
-			}
-
 			if ( ! this.filter )
 				return true;
 
diff --git a/src/modules/main_menu/index.js b/src/modules/main_menu/index.js
index d9e613cf..2f17af0c 100644
--- a/src/modules/main_menu/index.js
+++ b/src/modules/main_menu/index.js
@@ -625,6 +625,8 @@ export default class MainMenu extends Module {
 	_addDefinitionToTree(key, def, simple) {
 		if ( ! def.ui || ! this._settings_tree )
 			return;
+		if ( simple && ! def.ui.simple )
+			return;
 
 		if ( simple && def.ui.simple_path )
 			def.ui.path_tokens = parse_path(def.ui.simple_path);
diff --git a/src/std-components/tab-container.vue b/src/std-components/tab-container.vue
index 37ee896e..072f169f 100644
--- a/src/std-components/tab-container.vue
+++ b/src/std-components/tab-container.vue
@@ -213,19 +213,6 @@ export default {
 			if ( item.no_filter )
 				return true;
 
-			if ( this.context.simple_view ) {
-				// Don't hide any add-on settings in simple view
-				if ( item.path && item.path.startsWith('Add-Ons') )
-					return true;
-				for(const key of ['tabs', 'contents', 'items'])
-					if ( item[key] )
-						for(const thing of item[key])
-							if ( this.shouldShow(thing) )
-								return true;
-				if ( ! item.setting || ! item.simple )
-					return false;
-			}
-
 			if ( ! this.filter )
 				return true;