diff --git a/apps/files/js/detailsview.js b/apps/files/js/detailsview.js
index 1d33987cd5..ac10b8380e 100644
--- a/apps/files/js/detailsview.js
+++ b/apps/files/js/detailsview.js
@@ -118,8 +118,11 @@
 		 */
 		render: function() {
 			// remove old instances
-			$('#app-sidebar').remove();
-			this.$el.insertAfter($('#app-content'));
+			if ($('#app-sidebar').length === 0) {
+				this.$el.insertAfter($('#app-content'));
+			} else {
+				$('#app-sidebar').replaceWith(this.$el)
+			}
 			
 			var templateVars = {
 				closeLabel: t('files', 'Close')
diff --git a/apps/files/tests/js/favoritespluginspec.js b/apps/files/tests/js/favoritespluginspec.js
index 1b144c2870..bc4ec5b9fc 100644
--- a/apps/files/tests/js/favoritespluginspec.js
+++ b/apps/files/tests/js/favoritespluginspec.js
@@ -14,6 +14,7 @@ describe('OCA.Files.FavoritesPlugin tests', function() {
 
 	beforeEach(function() {
 		$('#testArea').append(
+			'<div id="content">' +
 			'<div id="app-navigation">' +
 			'<ul><li data-id="files"><a>Files</a></li>' +
 			'<li data-id="sharingin"><a></a></li>' +
@@ -25,6 +26,7 @@ describe('OCA.Files.FavoritesPlugin tests', function() {
 			'<div id="app-content-favorites" class="hidden">' +
 			'</div>' +
 			'</div>' +
+			'</div>' +
 			'</div>'
 		);
 		OC.Plugins.attach('OCA.Files.App', Plugin);
diff --git a/apps/files/tests/js/filelistSpec.js b/apps/files/tests/js/filelistSpec.js
index efaf9968de..1261e468af 100644
--- a/apps/files/tests/js/filelistSpec.js
+++ b/apps/files/tests/js/filelistSpec.js
@@ -2491,7 +2491,8 @@ describe('OCA.Files.FileList tests', function() {
 
 			expect($('#app-sidebar').hasClass('disappear')).toEqual(false);
 			fileList.remove('One.txt');
-			expect($('#app-sidebar').hasClass('disappear')).toEqual(true);
+			// sidebar is removed on close before being
+			expect($('#app-sidebar').length).toEqual(0);
 			jQuery.fx.off = false;
 		});
 		it('returns the currently selected model instance when calling getModelForFile', function() {
@@ -2515,7 +2516,7 @@ describe('OCA.Files.FileList tests', function() {
 
 			expect($('#app-sidebar').hasClass('disappear')).toEqual(false);
 			fileList.changeDirectory('/another');
-			expect($('#app-sidebar').hasClass('disappear')).toEqual(true);
+			expect($('#app-sidebar').length).toEqual(0);
 			jQuery.fx.off = false;
 		});
 	});
diff --git a/core/js/tests/specs/appsSpec.js b/core/js/tests/specs/appsSpec.js
index c3352e3e4a..3a4c413bbd 100644
--- a/core/js/tests/specs/appsSpec.js
+++ b/core/js/tests/specs/appsSpec.js
@@ -22,7 +22,7 @@
 describe('Apps base tests', function() {
 	describe('Sidebar utility functions', function() {
 		beforeEach(function() {
-			$('#testArea').append('<div id="app-content">Content</div><div id="app-sidebar">The sidebar</div>');
+			$('#testArea').append('<div id="content"><div id="app-content">Content</div><div id="app-sidebar">The sidebar</div></div>');
 			jQuery.fx.off = true;
 		});
 		afterEach(function() {
@@ -41,7 +41,7 @@ describe('Apps base tests', function() {
 		});
 		it('triggers appresize event when visibility changed', function() {
 			var eventStub = sinon.stub();
-			$('#app-content').on('appresized', eventStub);
+			$('#content').on('appresized', eventStub);
 			OC.Apps.showAppSidebar();
 			expect(eventStub.calledOnce).toEqual(true);
 			OC.Apps.hideAppSidebar();