diff --git a/Plugins/ServerFolders/ServerFolders.plugin.js b/Plugins/ServerFolders/ServerFolders.plugin.js
index e0185f8fb3..6a9b45c6d4 100644
--- a/Plugins/ServerFolders/ServerFolders.plugin.js
+++ b/Plugins/ServerFolders/ServerFolders.plugin.js
@@ -304,7 +304,7 @@ class ServerFolders {
 
 	getDescription () {return "Adds the feature to create folders to organize your servers. Right click a server > 'Serverfolders' > 'Create Server' to create a server. To add servers to a folder hold 'Ctrl' and drag the server onto the folder, this will add the server to the folderlist and hide it in the serverlist. To open a folder click the folder. A folder can only be opened when it has at least one server in it. To remove a server from a folder, open the folder and either right click the server > 'Serverfolders' > 'Remove Server from Folder' or hold 'Del' and click the server in the folderlist.";}
 
-	getVersion () {return "5.9.0";}
+	getVersion () {return "5.9.1";}
 
 	getAuthor () {return "DevilBro";}
 	
@@ -1197,17 +1197,8 @@ class ServerFolders {
 				}
 			})
 			.on("contextmenu." + this.getName(), (e) => {
-				var handleContextMenu = BDFDB.getKeyInformation({"node":serverDiv.firstElementChild, "key":"handleContextMenu"});
-				if (handleContextMenu) {
-					var data = {
-						preventDefault: a=>a,
-						stopPropagation: a=>a,
-						pageX: e.pageX,
-						pageY: e.pageY,
-					};
-					
-					handleContextMenu(data);
-				}
+				var instance = BDFDB.getOwnerInstance({node:serverDiv.firstElementChild, props:["animate","handleContextMenu"]});
+				if (instance) instance.handleContextMenu({preventDefault: a=>a,stopPropagation: a=>a,pageX: e.pageX,pageY: e.pageY});
 			})
 			.on("mousedown." + this.getName(), (e) => {
 				var mouseTimeout = null;