diff --git a/packages/rocketchat-apps/server/orchestrator.js b/packages/rocketchat-apps/server/orchestrator.js
index a4d6d39664fb..840bc775bab9 100644
--- a/packages/rocketchat-apps/server/orchestrator.js
+++ b/packages/rocketchat-apps/server/orchestrator.js
@@ -98,9 +98,13 @@ class AppServerOrchestrator {
 	}
 }
 
-RocketChat.settings.add('Apps_Framework_enabled', true, {
-	type: 'boolean',
-	hidden: true,
+RocketChat.settings.addGroup('General', function() {
+	this.section('Apps', function() {
+		this.add('Apps_Framework_enabled', true, {
+			type: 'boolean',
+			hidden: false,
+		});
+	});
 });
 
 RocketChat.settings.get('Apps_Framework_enabled', (key, isEnabled) => {
diff --git a/tests/pageobjects/administration.page.js b/tests/pageobjects/administration.page.js
index d3884749c806..bccd94a26038 100644
--- a/tests/pageobjects/administration.page.js
+++ b/tests/pageobjects/administration.page.js
@@ -65,13 +65,13 @@ class Administration extends Page {
 	// settings
 	get buttonSave() { return browser.element('button.save'); }
 
-	get generalButtonExpandIframe() { return browser.element('.section:nth-of-type(3) .button.expand'); }
-	get generalButtonExpandNotifications() { return browser.element('.section:nth-of-type(4) .button.expand'); }
-	get generalButtonExpandRest() { return browser.element('.section:nth-of-type(5) .button.expand'); }
-	get generalButtonExpandReporting() { return browser.element('.section:nth-of-type(6) .button.expand'); }
-	get generalButtonExpandStreamCast() { return browser.element('.section:nth-of-type(7) .button.expand'); }
-	get generalButtonExpandTranslations() { return browser.element('.section:nth-of-type(8) .button.expand'); }
-	get generalButtonExpandUTF8() { return browser.element('.section:nth-of-type(9) .button.expand'); }
+	get generalButtonExpandIframe() { return browser.element('.section:nth-of-type(4) .button.expand'); }
+	get generalButtonExpandNotifications() { return browser.element('.section:nth-of-type(5) .button.expand'); }
+	get generalButtonExpandRest() { return browser.element('.section:nth-of-type(6) .button.expand'); }
+	get generalButtonExpandReporting() { return browser.element('.section:nth-of-type(7) .button.expand'); }
+	get generalButtonExpandStreamCast() { return browser.element('.section:nth-of-type(8) .button.expand'); }
+	get generalButtonExpandTranslations() { return browser.element('.section:nth-of-type(9) .button.expand'); }
+	get generalButtonExpandUTF8() { return browser.element('.section:nth-of-type(10) .button.expand'); }
 
 	get generalSiteUrl() { return browser.element('[name="Site_Url"]'); }
 	get generalSiteUrlReset() { return browser.element('.reset-setting[data-setting="Site_Url"]'); }