diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index de02bf5e73..5bd75ac628 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -133,6 +133,8 @@
 		display: function (parent, triggerEvent, fileList) {
 			if (!fileList) {
 				console.warn('FileActions.display() MUST be called with a OCA.Files.FileList instance');
+				// using default list instead, which could be wrong
+				fileList = OCA.Files.App.fileList;
 			}
 			this.currentFile = parent;
 			var self = this;
@@ -162,7 +164,7 @@
 
 				event.data.actionFunc(file, {
 					$file: $tr,
-					fileList: fileList || OCA.Files.App.fileList,
+					fileList: fileList,
 					fileActions: self,
 					dir: $tr.attr('data-path') || fileList.getCurrentDirectory()
 				});