diff --git a/modules/editor/grapheditor/editor/graph/graphcontroller.cpp b/modules/editor/grapheditor/editor/graph/graphcontroller.cpp
index d6c8e9e31..ad94676b8 100644
--- a/modules/editor/grapheditor/editor/graph/graphcontroller.cpp
+++ b/modules/editor/grapheditor/editor/graph/graphcontroller.cpp
@@ -43,7 +43,6 @@ void GraphController::setGraph(AbstractNodeGraph *graph) {
     GraphNode *defaultNode = m_graph->defaultNode();
     if(defaultNode) {
         setSelected({ defaultNode });
-        emit m_view->itemsSelected(m_selectedItems);
     }
 }
 
@@ -53,6 +52,7 @@ const QList<QObject *> &GraphController::selectedItems() const {
 
 void GraphController::setSelected(const QList<QObject *> &selected) {
     m_selectedItems = selected;
+    emit m_view->itemsSelected(m_selectedItems);
 }
 
 void GraphController::composeLinks() {
@@ -150,7 +150,6 @@ void GraphController::update() {
                 }
                 m_softSelectedItems.clear();
             }
-            emit m_view->itemsSelected(m_selectedItems);
         }
     }
 
@@ -169,7 +168,7 @@ void GraphController::update() {
                         widget->setSelected(true);
                         setSelected({ node });
                         m_softSelectedItems.clear();
-                        emit m_view->itemsSelected(m_selectedItems);
+
                     } else {
                         widget->setSelected(false);
                     }
@@ -250,7 +249,6 @@ void GraphController::update() {
                         reinterpret_cast<NodeWidget *>(node->widget())->setSelected(false);
                     }
                     setSelected({ m_focusedWidget->node() });
-                    emit m_view->itemsSelected(m_selectedItems);
                     m_focusedWidget->setSelected(true);
                 }
 
diff --git a/modules/editor/grapheditor/editor/graph/graphnode.cpp b/modules/editor/grapheditor/editor/graph/graphnode.cpp
index 598dc5131..e521a4274 100644
--- a/modules/editor/grapheditor/editor/graph/graphnode.cpp
+++ b/modules/editor/grapheditor/editor/graph/graphnode.cpp
@@ -151,7 +151,10 @@ QDomElement GraphNode::fromVariant(const QVariant &value, QDomDocument &xml) {
             valueElement.setAttribute(gType, "Color");
 
             QColor col = value.value<QColor>();
-            valueElement.appendChild(xml.createTextNode(QString::number(col.red()) + ", " + col.green() + ", " + col.blue() + ", " + col.alpha()));
+            valueElement.appendChild(xml.createTextNode(QString::number(col.red()) + ", " +
+                                                        QString::number(col.green()) + ", " +
+                                                        QString::number(col.blue()) + ", " +
+                                                        QString::number(col.alpha()) ));
         } break;
         default: {
             if(value.canConvert<Template>()) {
@@ -163,17 +166,23 @@ QDomElement GraphNode::fromVariant(const QVariant &value, QDomDocument &xml) {
                 valueElement.setAttribute(gType, "Vector2");
 
                 Vector2 vec = value.value<Vector2>();
-                valueElement.appendChild(xml.createTextNode(QString::number(vec.x) + ", " + vec.y));
+                valueElement.appendChild(xml.createTextNode(QString::number(vec.x) + ", " +
+                                                            QString::number(vec.y) ));
             } else if(value.canConvert<Vector3>()) {
                 valueElement.setAttribute(gType, "Vector3");
 
                 Vector3 vec = value.value<Vector3>();
-                valueElement.appendChild(xml.createTextNode(QString::number(vec.x) + ", " + vec.y + ", " + vec.z));
+                valueElement.appendChild(xml.createTextNode(QString::number(vec.x) + ", " +
+                                                            QString::number(vec.y) + ", " +
+                                                            QString::number(vec.z) ));
             } else if(value.canConvert<Vector4>()) {
                 valueElement.setAttribute(gType, "Vector3");
 
                 Vector4 vec = value.value<Vector4>();
-                valueElement.appendChild(xml.createTextNode(QString::number(vec.x) + ", " + vec.y + ", " + vec.z + ", " + vec.w));
+                valueElement.appendChild(xml.createTextNode(QString::number(vec.x) + ", " +
+                                                            QString::number(vec.y) + ", " +
+                                                            QString::number(vec.z) + ", " +
+                                                            QString::number(vec.w) ));
             } else {
                 QString type = value.typeName();
                 if(type == "QString") {