diff --git a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/toolwindow/GHPRToolWindowTabControllerImpl.kt b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/toolwindow/GHPRToolWindowTabControllerImpl.kt
index 14da23379a53..d978a2509cd9 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/toolwindow/GHPRToolWindowTabControllerImpl.kt
+++ b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/toolwindow/GHPRToolWindowTabControllerImpl.kt
@@ -220,8 +220,10 @@ internal class GHPRToolWindowTabControllerImpl(private val project: Project,
                                           private val wrapper: Wrapper,
                                           private val parentDisposable: Disposable) : GHPRToolWindowTabComponentController {
 
-    private val listComponent = GHPRListComponent.create(project, dataContext, parentDisposable)
-    private val createComponent = GHPRCreateComponentFactory(project, dataContext, this, parentDisposable).create()
+    private val listComponent by lazy { GHPRListComponent.create(project, dataContext, parentDisposable) }
+    private val createComponent by lazy {
+      GHPRCreateComponentFactory(project,  dataContext, this, parentDisposable).create()
+    }
     private var currentDisposable: Disposable? = null
 
     private var currentPullRequest: GHPRIdentifier? = null