diff --git a/lib/network/modules/InteractionHandler.js b/lib/network/modules/InteractionHandler.js
index ea971076..1892e303 100644
--- a/lib/network/modules/InteractionHandler.js
+++ b/lib/network/modules/InteractionHandler.js
@@ -190,10 +190,7 @@ class InteractionHandler {
 
     let {nodesChanges, edgesChanges} = this._determineIfDifferent(previousSelection, currentSelection);
 
-    if (selectedNodesCount - previouslySelectedNodeCount > 0 || (selectedNodesCount === previouslySelectedNodeCount && nodesChanges === true)) { // node was selected
-      if (selectedNodesCount === previouslySelectedNodeCount && nodesChanges === true) {
-        this.selectionHandler._generateClickEvent('deselectNode', event, pointer, previousSelection);
-      }
+    if (selectedNodesCount - previouslySelectedNodeCount > 0) { // node was selected
       this.selectionHandler._generateClickEvent('selectNode', event, pointer);
       selected = true;
     }
@@ -201,18 +198,26 @@ class InteractionHandler {
       this.selectionHandler._generateClickEvent('deselectNode', event, pointer, previousSelection);
       selected = true;
     }
+    else if (selectedNodesCount === previouslySelectedNodeCount && nodesChanges === true) {
+      this.selectionHandler._generateClickEvent('deselectNode', event, pointer, previousSelection);
+      this.selectionHandler._generateClickEvent('selectNode', event, pointer);
+      selected = true;
+    }
 
-    if (selectedEdgesCount - previouslySelectedEdgeCount > 0|| (selectedEdgesCount === previouslySelectedEdgeCount && edgesChanges === true)) { // node was selected
-      if (selectedEdgesCount === previouslySelectedEdgeCount && edgesChanges === true) {
-        this.selectionHandler._generateClickEvent('deselectEdge', event, pointer, previousSelection);
-      }
+    if (selectedEdgesCount - previouslySelectedEdgeCount > 0) { // edge was selected
       this.selectionHandler._generateClickEvent('selectEdge', event, pointer);
       selected = true;
     }
-    else if (selectedEdgesCount - previouslySelectedEdgeCount < 0) { // node was deselected
+    else if (selectedEdgesCount - previouslySelectedEdgeCount < 0) { // edge was deselected
       this.selectionHandler._generateClickEvent('deselectEdge', event, pointer, previousSelection);
       selected = true;
     }
+    else if (selectedEdgesCount === previouslySelectedEdgeCount && edgesChanges === true) {
+      this.selectionHandler._generateClickEvent('deselectEdge', event, pointer, previousSelection);
+      this.selectionHandler._generateClickEvent('selectEdge', event, pointer);
+      selected = true;
+    }
+
 
     if (selected === true) { // select or unselect
       this.selectionHandler._generateClickEvent('select', event, pointer);