diff --git a/diylc/diylc-swing/src/org/diylc/swing/plugins/canvas/CanvasPlugin.java b/diylc/diylc-swing/src/org/diylc/swing/plugins/canvas/CanvasPlugin.java
index 6567d02d..c1b5ea56 100644
--- a/diylc/diylc-swing/src/org/diylc/swing/plugins/canvas/CanvasPlugin.java
+++ b/diylc/diylc-swing/src/org/diylc/swing/plugins/canvas/CanvasPlugin.java
@@ -271,7 +271,6 @@ public class CanvasPlugin implements IPlugIn, ClipboardOwner {
 
         @Override
         public void mousePressed(MouseEvent e) {
-          LOG.info("Pressed: " + e.isPopupTrigger());
           canvasPanel.requestFocus();
           pressedEvent = e;
         }
diff --git a/diylc/diylc-swing/src/org/diylc/swing/plugins/toolbox/ComponentTabbedPane.java b/diylc/diylc-swing/src/org/diylc/swing/plugins/toolbox/ComponentTabbedPane.java
index 4893b387..a5c52931 100644
--- a/diylc/diylc-swing/src/org/diylc/swing/plugins/toolbox/ComponentTabbedPane.java
+++ b/diylc/diylc-swing/src/org/diylc/swing/plugins/toolbox/ComponentTabbedPane.java
@@ -430,6 +430,17 @@ class ComponentTabbedPane extends JTabbedPane {
           variantPopup.add(new SelectAllAction(plugInPort, componentType));
           variantPopup.add(shortcutSubmenu);
           variantPopup.add(new JSeparator());
+          
+          if (componentType.getDatasheet() != null && !componentType.getDatasheet().isEmpty()) {
+            List<Component> items = ComponentButtonFactory.createDatasheetItems(plugInPort, componentType, new ArrayList<String>(), model -> {
+              LOG.info("Creating datasheet model " + String.join(", ", model));
+              plugInPort.setNewComponentTypeSlot(componentType, null, model, false);
+            });
+            for (Component item : items) {
+              variantPopup.add(item);
+            }
+            variantPopup.add(new JSeparator());
+          }
 
           List<Template> templates = plugInPort.getVariantsFor(componentType);
           if (templates == null || templates.isEmpty()) {