diff --git a/apps/files/templates/appnavigation.php b/apps/files/templates/appnavigation.php
index 70b98303b0..512300e3a5 100644
--- a/apps/files/templates/appnavigation.php
+++ b/apps/files/templates/appnavigation.php
@@ -12,7 +12,7 @@
 	<div id="app-settings">
 		<div id="app-settings-header">
 			<button class="settings-button" data-apps-slide-toggle="#app-settings-content">
-				<span><?php p($l->t('Settings'));?></span>
+				<?php p($l->t('Settings'));?>
 			</button>
 		</div>
 		<div id="app-settings-content">
diff --git a/core/js/apps.js b/core/js/apps.js
index e9aa0fdfe8..ecefa48caa 100644
--- a/core/js/apps.js
+++ b/core/js/apps.js
@@ -58,7 +58,7 @@
 				if (!area.is(':animated')) {
 
 					// button toggles the area
-					if (button === event.target) {
+					if (button === event.target.closest('[data-apps-slide-toggle]')) {
 						if (area.is(':visible')) {
 							hideArea();
 						} else {