diff --git a/src/navigator/view/ItemView.js b/src/navigator/view/ItemView.js
index 4c10ed196..6e51ce36c 100644
--- a/src/navigator/view/ItemView.js
+++ b/src/navigator/view/ItemView.js
@@ -138,6 +138,13 @@ module.exports = Backbone.View.extend({
    * @param	Event
    * */
   startSort(e) {
+    e.stopPropagation();
+
+    //Right or middel click
+    if (e.button !== 0) {
+      return;
+    }
+
     this.sorter && this.sorter.startSort(e.target);
   },
 
diff --git a/src/navigator/view/ItemsView.js b/src/navigator/view/ItemsView.js
index 58dc8d3c0..ebdc18c2a 100644
--- a/src/navigator/view/ItemsView.js
+++ b/src/navigator/view/ItemsView.js
@@ -24,6 +24,7 @@ module.exports = Backbone.View.extend({
         itemSel: '.' + pfx + 'item',
         ppfx: this.ppfx,
         ignoreViewChildren: 1,
+        avoidSelectOnEnd: 1,
         pfx,
         nested: 1
       });
diff --git a/src/utils/Sorter.js b/src/utils/Sorter.js
index 8452dbcd4..636a3d2a2 100644
--- a/src/utils/Sorter.js
+++ b/src/utils/Sorter.js
@@ -39,6 +39,7 @@ module.exports = Backbone.View.extend({
     this.em = o.em || '';
     this.dragHelper = null;
     this.canvasRelative = o.canvasRelative || 0;
+    this.selectOnEnd = !o.avoidSelectOnEnd;
 
     if(this.em && this.em.on){
       this.em.on('change:canvasOffset', this.udpateOffset);
@@ -765,7 +766,7 @@ module.exports = Backbone.View.extend({
       var srcModel = this.getSourceModel();
       if (srcModel && srcModel.set) {
         srcModel.set('status', '');
-        srcModel.set('status', 'selected');
+        this.selectOnEnd && srcModel.set('status', 'selected');
       }
     }