diff --git a/debian/changelog.Debian b/debian/changelog.Debian
index c729fa6c..a1c78b1f 100644
--- a/debian/changelog.Debian
+++ b/debian/changelog.Debian
@@ -2,6 +2,8 @@ pve-manager (4.2-8) unstable; urgency=medium
 
   * depend on pve-docs package
 
+  * fix right click selection in tree
+
  -- Proxmox Support Team <support@proxmox.com>  Wed, 25 May 2016 10:00:22 +0200
 
 pve-manager (4.2-7) unstable; urgency=medium
diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js
index 992ae85e..6900897a 100644
--- a/www/manager6/Utils.js
+++ b/www/manager6/Utils.js
@@ -1188,7 +1188,9 @@ Ext.define('PVE.Utils', { statics: {
 
     createCmdMenu: function(v, record, item, index, event) {
 	event.stopEvent();
-	v.select(record);
+	if (!(v instanceof Ext.tree.View)) {
+	    v.select(record);
+	}
 	var menu;
 
 	if (record.data.type === 'qemu' && !record.data.template) {
diff --git a/www/manager6/tree/ResourceTree.js b/www/manager6/tree/ResourceTree.js
index b15ed4f1..5244b7c4 100644
--- a/www/manager6/tree/ResourceTree.js
+++ b/www/manager6/tree/ResourceTree.js
@@ -379,9 +379,9 @@ Ext.define('PVE.tree.ResourceTree', {
 		destroy: function() {
 		    rstore.un("load", updateTree);
 		},
-		beforecellmousedown: function (tree, record,item,index,ev) {
+		beforecellmousedown: function (tree, td, cellIndex, record, tr, rowIndex, ev) {
 		    // disable selection when right clicking
-		    me.allowSelection = (event.button !== 2);
+		    me.allowSelection = (ev.button !== 2);
 		},
 		beforeselect: function (tree, record, index, eopts) {
 		    var allow = me.allowSelection;