diff --git a/init.d/programming/common.el b/init.d/programming/common.el
index 96c193c..070b8ce 100644
--- a/init.d/programming/common.el
+++ b/init.d/programming/common.el
@@ -1,6 +1,6 @@
 ;;; common.el --- Common programming settings. -*- lexical-binding: t; -*-
 
-;; Time-stamp: <2020-02-11T18:31:37+0100>
+;; Time-stamp: <2020-02-11T23:37:35+0100>
 
 ;;; Commentary:
 
@@ -132,10 +132,13 @@
               (substring (shell-command-to-string "nproc --ignore=1") 0 -1)))
 
     (defun my/switch-project ()
-      "Open `treemacs' and add project to workspace."
+      "Open `treemacs', add project to workspace and find file in project."
       (treemacs-add-and-display-current-project)
       (treemacs-collapse-other-projects)
-      (treemacs-toggle-node))
+      (treemacs-toggle-node)
+      (if (member 'counsel-projectile-mode minor-mode-list)
+          (counsel-projectile-find-file)
+        (projectile-find-file)))
 
     (defun my/projectile-kill-buffers ()
       "Kill project buffers and delete other windows."