diff --git a/diylc/diylc-core/src/org/diylc/presenter/Presenter.java b/diylc/diylc-core/src/org/diylc/presenter/Presenter.java
index a556489d..84453248 100644
--- a/diylc/diylc-core/src/org/diylc/presenter/Presenter.java
+++ b/diylc/diylc-core/src/org/diylc/presenter/Presenter.java
@@ -1790,18 +1790,19 @@ public class Presenter implements IPlugInPort {
       setNewComponentTypeSlot(null, null);
       return;
     }
-    
+
     // try to find a default template if none is provided
     if (componentType != null && template == null) {
       List<Template> templates = getTemplatesFor(componentType.getCategory(), componentType.getName());
-      for (Template t : templates) {
-        if (t.isDefaultFlag()) {
-          template = t;
-          break;
+      if (templates != null)
+        for (Template t : templates) {
+          if (t.isDefaultFlag()) {
+            template = t;
+            break;
+          }
         }
-      }
     }
-    
+
     try {
       instantiationManager.setComponentTypeSlot(componentType, template, currentProject);
       if (componentType != null) {
diff --git a/diylc/diylc-library/lib/diylc-core.jar b/diylc/diylc-library/lib/diylc-core.jar
index 2c1cc686..edee0b10 100644
Binary files a/diylc/diylc-library/lib/diylc-core.jar and b/diylc/diylc-library/lib/diylc-core.jar differ
diff --git a/diylc/diylc-swing/build.xml b/diylc/diylc-swing/build.xml
index 3ea237ce..dd608ce8 100644
--- a/diylc/diylc-swing/build.xml
+++ b/diylc/diylc-swing/build.xml
@@ -7,7 +7,7 @@
 	<property name="jar.dir" value="${build.dir}/jar" />
 	<property name="report.dir" value="${build.dir}/junitreport" />
 	<property name="main.class" value="org.diylc.DIYLCStarter" />
-	<property name="diylc.version" value="3.34.0" />
+	<property name="diylc.version" value="3.35.0" />
 
 	<property name="classes.dir" value="${build.dir}/temp/${ant.project.name}/classes" />
 	<property name="test.classes.dir" value="${build.dir}/temp/${ant.project.name}/test.classes" />
diff --git a/diylc/diylc-swing/lib/diylc-core.jar b/diylc/diylc-swing/lib/diylc-core.jar
index 2c1cc686..edee0b10 100644
Binary files a/diylc/diylc-swing/lib/diylc-core.jar and b/diylc/diylc-swing/lib/diylc-core.jar differ
diff --git a/diylc/diylc-swing/src/org/diylc/swing/gui/MainFrame.java b/diylc/diylc-swing/src/org/diylc/swing/gui/MainFrame.java
index dbe24056..6935bb12 100644
--- a/diylc/diylc-swing/src/org/diylc/swing/gui/MainFrame.java
+++ b/diylc/diylc-swing/src/org/diylc/swing/gui/MainFrame.java
@@ -94,9 +94,10 @@ public class MainFrame extends JFrame implements ISwingUI {
     DialogFactory.getInstance().initialize(this);
 
     this.presenter = new Presenter(this);
+    
+    canvasPlugin = new CanvasPlugin(this);
 
-    presenter.installPlugin(new ToolBox(this));
-    presenter.installPlugin(new ComponentTree(this));
+    presenter.installPlugin(new ToolBox(this));    
     presenter.installPlugin(new FileMenuPlugin(this));
     presenter.installPlugin(new EditMenuPlugin(this));
     presenter.installPlugin(new ConfigPlugin(this));
@@ -105,8 +106,10 @@ public class MainFrame extends JFrame implements ISwingUI {
     presenter.installPlugin(new HelpMenuPlugin(this));
 
     presenter.installPlugin(new StatusBar(this));
-    canvasPlugin = new CanvasPlugin(this);
+    
     presenter.installPlugin(canvasPlugin);
+    
+    presenter.installPlugin(new ComponentTree(this, canvasPlugin.getCanvasPanel()));
     presenter.installPlugin(new FramePlugin());
 
     try {
diff --git a/diylc/diylc-swing/src/org/diylc/swing/plugins/canvas/CanvasPanel.java b/diylc/diylc-swing/src/org/diylc/swing/plugins/canvas/CanvasPanel.java
index 980592e1..d6ebcc3b 100644
--- a/diylc/diylc-swing/src/org/diylc/swing/plugins/canvas/CanvasPanel.java
+++ b/diylc/diylc-swing/src/org/diylc/swing/plugins/canvas/CanvasPanel.java
@@ -34,7 +34,7 @@ import org.diylc.common.IPlugInPort;
  * 
  * @author Branislav Stojkovic
  */
-class CanvasPanel extends JComponent implements Autoscroll {
+public class CanvasPanel extends JComponent implements Autoscroll {
 
   private static final long serialVersionUID = 1L;
 
diff --git a/diylc/diylc-swing/src/org/diylc/swing/plugins/tree/ComponentTree.java b/diylc/diylc-swing/src/org/diylc/swing/plugins/tree/ComponentTree.java
index 9f02ae42..f1b26836 100644
--- a/diylc/diylc-swing/src/org/diylc/swing/plugins/tree/ComponentTree.java
+++ b/diylc/diylc-swing/src/org/diylc/swing/plugins/tree/ComponentTree.java
@@ -5,6 +5,7 @@ import java.awt.KeyboardFocusManager;
 import java.awt.event.KeyEvent;
 import java.util.EnumSet;
 
+import javax.swing.JComponent;
 import javax.swing.SwingConstants;
 
 import org.apache.log4j.Logger;
@@ -27,9 +28,11 @@ public class ComponentTree implements IPlugIn {
   private IPlugInPort plugInPort;
 
   private TreePanel treePanel;
+  private JComponent canvasPanel;
 
-  public ComponentTree(ISwingUI swingUI) {
+  public ComponentTree(ISwingUI swingUI, JComponent canvasPanel) {
     this.swingUI = swingUI;
+    this.canvasPanel = canvasPanel;
   }
 
   @Override
@@ -57,7 +60,11 @@ public class ComponentTree implements IPlugIn {
 
       @Override
       public boolean dispatchKeyEvent(KeyEvent e) {
-        if (e.getKeyChar() == 'q') {
+        if ((canvasPanel.hasFocus() || treePanel.hasFocus())
+            && e.getKeyChar() == 'q'
+            && ConfigurationManager.getInstance()
+                .readString(ConfigPlugin.COMPONENT_BROWSER, ConfigPlugin.SEARCHABLE_TREE)
+                .equals(ConfigPlugin.SEARCHABLE_TREE)) {
           getTreePanel().getSearchField().requestFocusInWindow();
           return true;
         }
diff --git a/diylc/diylc-swing/update.xml b/diylc/diylc-swing/update.xml
index 2cbe99be..d5ac4cd7 100644
--- a/diylc/diylc-swing/update.xml
+++ b/diylc/diylc-swing/update.xml
@@ -1515,9 +1515,13 @@
 				<minor>35</minor>
 				<build>0</build>
 			</versionNumber>
-			<releaseDate>2016-12-30 20:00:00.000 CET</releaseDate>
+			<releaseDate>2017-01-05 20:00:00.000 CET</releaseDate>
 			<name></name>
 			<changes>				
+				<org.diylc.appframework.update.Change>
+					<changeType>BUG_FIX</changeType>
+					<description>Cannot type "q" letter in any of the boxes around the app</description>
+				</org.diylc.appframework.update.Change>	
 				<org.diylc.appframework.update.Change>
 					<changeType>NEW_FEATURE</changeType>
 					<description>Mirror selection horizontally and vertically</description>