diff --git a/Source/UI/EditorViewport.cpp b/Source/UI/EditorViewport.cpp
index 6601351353754966bac96e2dbf98d47b5cf019a0..eedb242a7cbe50a983631770112f9012ba2ce8a5 100755
--- a/Source/UI/EditorViewport.cpp
+++ b/Source/UI/EditorViewport.cpp
@@ -139,13 +139,13 @@ void EditorViewport::paint(Graphics& g)
     //int w = 30;
     //int h = getHeight() - 2*(borderSize+2);
 
-    if (editorArray.size() > 0)
-    {
-        if (!editorArray[0]->getProcessor()->isSource())
-            g.drawImageAt(sourceDropImage, x, y);
-    } else {
+    //if (editorArray.size() > 0)
+    //{
+        //if (!editorArray[0]->getProcessor()->isSource())
+    //    g.drawImageAt(sourceDropImage, x, y);
+    //} else {
         g.drawImageAt(sourceDropImage, x, y);
-    }
+    //}
 }
 
 bool EditorViewport::isInterestedInDragSource(const SourceDetails& dragSourceDetails)
@@ -279,8 +279,11 @@ void EditorViewport::itemDropped(const SourceDetails& dragSourceDetails)
 
 void EditorViewport::clearSignalChain()
 {
+
     if (canEdit)
     {
+        editorArray.clear();
+        //const MessageManagerLock mmLock; // prevent redraw while deleting
         std::cout << "Clearing signal chain." << std::endl;
         signalChainManager->clearSignalChain();
         getProcessorGraph()->clearSignalChain();
@@ -294,7 +297,7 @@ void EditorViewport::clearSignalChain()
 
     }
 
-    //repaint();
+    repaint();
 }
 
 void EditorViewport::makeEditorVisible(GenericEditor* editor, bool highlight, bool updateSettings)
diff --git a/Source/UI/UIComponent.cpp b/Source/UI/UIComponent.cpp
index 5811e06494fcc14a2bd1a4aa45a1cddb53498eb2..767ad92776fb511f404c2999f6fb9bb6ccf3c8f3 100755
--- a/Source/UI/UIComponent.cpp
+++ b/Source/UI/UIComponent.cpp
@@ -439,8 +439,10 @@ bool UIComponent::perform(const InvocationInfo& info)
                 break;
             }
         case clearSignalChain:
+        {
             getEditorViewport()->clearSignalChain();
             break;
+        }
 
         case showHelp:
             std::cout << "SHOW ME SOME HELP!" << std::endl;