diff --git a/apps/files/index.php b/apps/files/index.php
index 22240deadca..c2c0ba02a99 100644
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@ -119,7 +119,8 @@ if ($needUpgrade) {
 	}
 
 	$isCreatable = \OC\Files\Filesystem::isCreatable($dir . '/');
-	$emptyContent = (!isset($files) or count($files) > 0 or $ajaxLoad);
+	$fileHeader = (!isset($files) or count($files) > 0);
+	$emptyContent = $isCreatable or $fileHeader or $ajaxLoad;
 
 	OCP\Util::addscript('files', 'fileactions');
 	OCP\Util::addscript('files', 'files');
@@ -145,6 +146,7 @@ if ($needUpgrade) {
 	$tmpl->assign('disableSharing', false);
 	$tmpl->assign('ajaxLoad', $ajaxLoad);
 	$tmpl->assign('emptyContent', $emptyContent);
+	$tmpl->assign('fileHeader', $fileHeader);
 
 	$tmpl->printPage();
 }
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 20930b2dce8..17e7fb6440e 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -623,7 +623,7 @@ var FileList={
 		var $fileList = $('#fileList');
 		var permissions = $('#permissions').val();
 		var isCreatable = (permissions & OC.PERMISSION_CREATE) !== 0;
-		$('#emptycontent').toggleClass('hidden', $fileList.find('tr').length > 0);
+		$('#emptycontent').toggleClass('hidden', !isCreatable || $fileList.find('tr').length > 0);
 		$('#filestable th').toggleClass('hidden', $fileList.find('tr').length === 0);
 	},
 	showMask: function(){
diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php
index af9cdffa5a3..c1373c3e9d5 100644
--- a/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@@ -42,14 +42,14 @@
 	<input type="hidden" name="permissions" value="<?php p($_['permissions']); ?>" id="permissions">
 </div>
 
-<div id="emptycontent" <?php if ($_['emptyContent']):?>class="hidden"<?php endif; ?>><?php p($l->t('Nothing in here. Upload something!'))?></div>
+<div id="emptycontent" <?php if (!$_['emptyContent']):?>class="hidden"<?php endif; ?>><?php p($l->t('Nothing in here. Upload something!'))?></div>
 
 <input type="hidden" id="disableSharing" data-status="<?php p($_['disableSharing']); ?>"></input>
 
 <table id="filestable" data-allow-public-upload="<?php p($_['publicUploadEnabled'])?>" data-preview-x="36" data-preview-y="36">
 	<thead>
 		<tr>
-			<th <?php if (!$_['emptyContent']):?>class="hidden"<?php endif; ?> id='headerName'>
+			<th <?php if (!$_['fileHeader']):?>class="hidden"<?php endif; ?> id='headerName'>
 				<div id="headerName-container">
 					<input type="checkbox" id="select_all" />
 					<label for="select_all"></label>
@@ -65,8 +65,8 @@
 					</span>
 				</div>
 			</th>
-			<th <?php if (!$_['emptyContent']):?>class="hidden"<?php endif; ?> id="headerSize"><?php p($l->t('Size')); ?></th>
-			<th <?php if (!$_['emptyContent']):?>class="hidden"<?php endif; ?> id="headerDate">
+			<th <?php if (!$_['fileHeader']):?>class="hidden"<?php endif; ?> id="headerSize"><?php p($l->t('Size')); ?></th>
+			<th <?php if (!$_['fileHeader']):?>class="hidden"<?php endif; ?> id="headerDate">
 				<span id="modified"><?php p($l->t( 'Modified' )); ?></span>
 				<?php if ($_['permissions'] & OCP\PERMISSION_DELETE): ?>
 <!--					NOTE: Temporary fix to allow unsharing of files in root of Shared folder -->