diff --git a/modules/editor/grapheditor/editor/graph/abstractnodegraph.cpp b/modules/editor/grapheditor/editor/graph/abstractnodegraph.cpp
index 7041b8bb5..5b12040ad 100644
--- a/modules/editor/grapheditor/editor/graph/abstractnodegraph.cpp
+++ b/modules/editor/grapheditor/editor/graph/abstractnodegraph.cpp
@@ -60,7 +60,9 @@ AbstractNodeGraph::Link *AbstractNodeGraph::linkCreate(GraphNode *sender, NodePo
         }
     }
     if(result) {
-        linkDelete(iport);
+        if(iport != nullptr) {
+            linkDelete(iport);
+        }
 
         if((oport && iport && oport->m_call == iport->m_call) ||
            (oport == nullptr && iport == nullptr)) {
diff --git a/modules/editor/grapheditor/editor/graph/graphcontroller.cpp b/modules/editor/grapheditor/editor/graph/graphcontroller.cpp
index a22e3d91e..d88f69aa3 100644
--- a/modules/editor/grapheditor/editor/graph/graphcontroller.cpp
+++ b/modules/editor/grapheditor/editor/graph/graphcontroller.cpp
@@ -365,10 +365,8 @@ void GraphController::update() {
                     }
                 }
 
-                if(Widget::focusWidget() == hovered) {
-                    beginDrag();
-                    m_dragWidget = hovered;
-                }
+                beginDrag();
+                m_dragWidget = hovered;
             } else {
                 m_view->rubberBand()->setEnabled(true);
                 m_view->rubberBand()->raise();