diff --git a/app/src/processing/app/Editor.java b/app/src/processing/app/Editor.java
index e959f75e1..4625917e2 100644
--- a/app/src/processing/app/Editor.java
+++ b/app/src/processing/app/Editor.java
@@ -598,6 +598,7 @@ public abstract class Editor extends JFrame implements RunnerListener {
 
   public void rebuildToolbar() {
     toolbar.rebuild();
+    toolbar.revalidate();  // necessary to handle sub-components
   }
 
 
diff --git a/app/src/processing/app/EditorToolbar.java b/app/src/processing/app/EditorToolbar.java
index 528475b71..8443c6e92 100644
--- a/app/src/processing/app/EditorToolbar.java
+++ b/app/src/processing/app/EditorToolbar.java
@@ -132,8 +132,6 @@ abstract public class EditorToolbar extends JPanel {
 
 
   public void paintComponent(Graphics g) {
-//    label.setText(editor.getSketch().getName());
-//    super.paintComponent(g);
     Dimension size = getSize();
     g.drawImage(gradient, 0, 0, size.width, size.height, this);
   }