diff --git a/apps/files/lib/Controller/ApiController.php b/apps/files/lib/Controller/ApiController.php
index 3738358bfb0ca017183911b75a71c0db82b42def..aae1bec2e789433e6ce188c2714c64417a01e3a3 100644
--- a/apps/files/lib/Controller/ApiController.php
+++ b/apps/files/lib/Controller/ApiController.php
@@ -313,7 +313,7 @@ class ApiController extends Controller {
 	 */
 	public function getShowQuickAccess() {
 
-		return $this->config->getUserValue($this->userSession->getUser()->getUID(), 'files', 'show_Quick_Access', 1);
+		return $this->config->getUserValue($this->userSession->getUser()->getUID(), 'files', 'show_Quick_Access', 0);
 	}
 
 	/**
diff --git a/apps/files/lib/Controller/ViewController.php b/apps/files/lib/Controller/ViewController.php
index 13b33b96cc89e4911311571f008bab89200e3a5a..15d9334ed9e4ebf8fcce7ddbe151efd1b0c6cb9a 100644
--- a/apps/files/lib/Controller/ViewController.php
+++ b/apps/files/lib/Controller/ViewController.php
@@ -202,16 +202,11 @@ class ViewController extends Controller {
 		}
 
 
-		$defaultExpandedState = 'true';
-		if (!$this->config->getUserValue($this->userSession->getUser()->getUID(), 'files', 'show_Quick_Access', 1)) {
-			$defaultExpandedState = 'false';
-		}
+		// show_Quick_Access stored as string
+		$defaultExpandedState = $this->config->getUserValue($this->userSession->getUser()->getUID(), 'files', 'show_Quick_Access', '0') === '1';
 
-		$quickAccessDraggable = 'false';
-		//See Javascript navigation.js for possible sorting strategies
-		if($this->config->getUserValue($this->userSession->getUser()->getUID(), 'files', 'quickaccess_sorting_strategy', 'alphabet')=='customorder'){
-			$quickAccessDraggable = 'true';
-		}
+		// see Javascript navigation.js for possible sorting strategies
+		$quickAccessDraggable = $this->config->getUserValue($this->userSession->getUser()->getUID(), 'files', 'quickaccess_sorting_strategy', 'alphabet') === 'customorder';
 
 
 		\OCA\Files\App::getNavigationManager()->add(
diff --git a/apps/files/templates/appnavigation.php b/apps/files/templates/appnavigation.php
index 4265af3f2117353431c08652f5c372bdfad0aa87..7dfb5630bc144d7f31e471f9b2d5c9e72cf83cba 100644
--- a/apps/files/templates/appnavigation.php
+++ b/apps/files/templates/appnavigation.php
@@ -68,7 +68,7 @@ function NavigationListElements($item, $l, $pinned) {
 	?>
 	<li <?php if (isset($item['sublist'])){ ?>id="button-collapse-parent-<?php p($item['id']); ?>"<?php } ?>
 		data-id="<?php p(isset($item['href']) ? $item['href'] : $item['id']) ?> "
-		class="nav-<?php p($item['id']) ?> <?php p($item['classes']) ?> <?php p($pinned === 1 ? 'first-pinned' : '') ?> <?php if ($item['defaultExpandedState'] === 'true') { ?> open<?php } ?>"
+		class="nav-<?php p($item['id']) ?> <?php p($item['classes']) ?> <?php p($pinned === 1 ? 'first-pinned' : '') ?> <?php if ($item['defaultExpandedState']) { ?> open<?php } ?>"
 		<?php if (isset($item['folderPosition'])) { ?> folderposition="<?php p($item['folderPosition']); ?>" <?php } ?>>
 
 		<a href="<?php p(isset($item['href']) ? $item['href'] : '#') ?>"