diff --git a/Engine/Settings.cpp b/Engine/Settings.cpp
index d5b41c658a..4e8e1c1921 100644
--- a/Engine/Settings.cpp
+++ b/Engine/Settings.cpp
@@ -901,7 +901,8 @@ Settings::initializeKnobsNodeGraph()
     _nodegraphTab->addKnob(_usePluginIconsInNodeGraph);
     
     _useAntiAliasing = Natron::createKnob<KnobBool>(this, "Anti-Aliasing");
-    _useAntiAliasing->setHintToolTip("When checked, the node graph will be painted using anti-aliasing. Unchecking it may increase performances.");
+    _useAntiAliasing->setHintToolTip("When checked, the node graph will be painted using anti-aliasing. Unchecking it may increase performances."
+                                     " Changing this requires a restart of Natron");
     _useAntiAliasing->setAnimationEnabled(false);
     _nodegraphTab->addKnob(_useAntiAliasing);
     
diff --git a/Gui/Edge.cpp b/Gui/Edge.cpp
index 5ca6d0f5d4..521e47be71 100644
--- a/Gui/Edge.cpp
+++ b/Gui/Edge.cpp
@@ -705,7 +705,11 @@ Edge::paint(QPainter *painter,
             const QStyleOptionGraphicsItem * /*options*/,
             QWidget * /*parent*/)
 {
-    painter->setRenderHint(QPainter::Antialiasing, false);
+    bool antialias = appPTR->getCurrentSettings()->isNodeGraphAntiAliasingEnabled();
+    if (!antialias) {
+        painter->setRenderHint(QPainter::Antialiasing, false);
+    }
+    
     QPen myPen = pen();
     
     boost::shared_ptr<NodeGui> dst = _imp->dest.lock();
@@ -879,7 +883,10 @@ LinkArrow::paint(QPainter *painter,
                  const QStyleOptionGraphicsItem* /*options*/,
                  QWidget* /*parent*/)
 {
-    painter->setRenderHint(QPainter::Antialiasing, false);
+    bool antialias = appPTR->getCurrentSettings()->isNodeGraphAntiAliasingEnabled();
+    if (!antialias) {
+        painter->setRenderHint(QPainter::Antialiasing, false);
+    }
     QPen myPen = pen();
 
     myPen.setColor(_renderColor);