diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 7bc91e6d0e..9c6effbe32 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -590,6 +590,7 @@
 			}
 
 			if (!fileName) {
+				this._detailsView.$el.find('[data-original-title]').tooltip('hide')
 				this._detailsView.setFileInfo(null);
 				if (this._currentFileModel) {
 					this._currentFileModel.off();
diff --git a/core/js/dist/login.js b/core/js/dist/login.js
index 62c7b2aa38..4cbd8eb25d 100644
Binary files a/core/js/dist/login.js and b/core/js/dist/login.js differ
diff --git a/core/js/dist/login.js.map b/core/js/dist/login.js.map
index 04dbbe9f71..a5953c7421 100644
Binary files a/core/js/dist/login.js.map and b/core/js/dist/login.js.map differ
diff --git a/core/js/dist/main.js b/core/js/dist/main.js
index dd3457e995..eb7a76d331 100644
Binary files a/core/js/dist/main.js and b/core/js/dist/main.js differ
diff --git a/core/js/dist/main.js.map b/core/js/dist/main.js.map
index 3ff4351038..86cb460a70 100644
Binary files a/core/js/dist/main.js.map and b/core/js/dist/main.js.map differ
diff --git a/core/js/dist/maintenance.js b/core/js/dist/maintenance.js
index ab87032a3a..1566328108 100644
Binary files a/core/js/dist/maintenance.js and b/core/js/dist/maintenance.js differ
diff --git a/core/js/dist/maintenance.js.map b/core/js/dist/maintenance.js.map
index 45beaf5342..ef75c5a735 100644
Binary files a/core/js/dist/maintenance.js.map and b/core/js/dist/maintenance.js.map differ
diff --git a/core/src/OC/apps.js b/core/src/OC/apps.js
index d476e74c81..9d96c3f402 100644
--- a/core/src/OC/apps.js
+++ b/core/src/OC/apps.js
@@ -37,6 +37,7 @@ Apps.showAppSidebar = function ($el) {
  */
 Apps.hideAppSidebar = function ($el) {
 	var $appSidebar = $el || $('#app-sidebar');
+	$appSidebar.find('[data-original-title]').tooltip('hide')
 	$appSidebar.hide().addClass('disappear');
 	$('#app-content').trigger(new $.Event('appresized'));
 };