diff --git a/app/scripts/directives/processTemplateDialog.js b/app/scripts/directives/processTemplateDialog.js
index 451e2e385f..2b02ae6a3e 100644
--- a/app/scripts/directives/processTemplateDialog.js
+++ b/app/scripts/directives/processTemplateDialog.js
@@ -85,6 +85,10 @@
     ctrl.$onInit = function() {
       ctrl.loginBaseUrl = DataService.openshiftAPIBaseUrl();
       ctrl.preSelectedProject = ctrl.selectedProject = ctrl.project;
+      if (ctrl.project) {
+        ctrl.templateProject = ctrl.project;
+        ctrl.templateProjectChange();
+      }
       listProjects();
 
       ctrl.projectEmptyState = {
diff --git a/app/views/directives/header/header.html b/app/views/directives/header/header.html
index cbe823aca0..d8eb1cfc21 100644
--- a/app/views/directives/header/header.html
+++ b/app/views/directives/header/header.html
@@ -50,5 +50,5 @@
 <overlay-panel show-panel="ordering.panelName" handle-close="closeOrderingPanel">
   <deploy-image-dialog ng-if="ordering.panelName === 'deployImage'" project="currentProject" context="context" on-dialog-closed="closeOrderingPanel"></deploy-image-dialog>
   <from-file-dialog ng-if="ordering.panelName === 'fromFile'" project="currentProject" context="context" on-dialog-closed="closeOrderingPanel"></from-file-dialog>
-  <process-template-dialog ng-if="ordering.panelName === 'fromProject'" project="project" use-project-template="true" on-dialog-closed="closeOrderingPanel"></process-template-dialog>
+  <process-template-dialog ng-if="ordering.panelName === 'fromProject'" project="currentProject" use-project-template="true" on-dialog-closed="closeOrderingPanel"></process-template-dialog>
 </overlay-panel>
diff --git a/dist/scripts/scripts.js b/dist/scripts/scripts.js
index 1048798b57..2b0dd7aa06 100644
--- a/dist/scripts/scripts.js
+++ b/dist/scripts/scripts.js
@@ -13224,7 +13224,7 @@ onShow: function() {
 b.infoStep.selected = !1, b.selectStep.selected = !1, b.configStep.selected = !1, b.resultsStep.selected = !0, b.nextTitle = "Close", m(), b.wizardDone = !0;
 }
 }, b.$onInit = function() {
-b.loginBaseUrl = r.openshiftAPIBaseUrl(), b.preSelectedProject = b.selectedProject = b.project, h(), b.projectEmptyState = {
+b.loginBaseUrl = r.openshiftAPIBaseUrl(), b.preSelectedProject = b.selectedProject = b.project, b.project && (b.templateProject = b.project, b.templateProjectChange()), h(), b.projectEmptyState = {
 title: "No Project Selected",
 info: "Please select a project from the dropdown to load Templates from that project."
 }, b.templatesEmptyState = {
diff --git a/dist/scripts/templates.js b/dist/scripts/templates.js
index 8fe121e568..b04b9009df 100644
--- a/dist/scripts/templates.js
+++ b/dist/scripts/templates.js
@@ -7306,7 +7306,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<overlay-panel show-panel=\"ordering.panelName\" handle-close=\"closeOrderingPanel\">\n" +
     "<deploy-image-dialog ng-if=\"ordering.panelName === 'deployImage'\" project=\"currentProject\" context=\"context\" on-dialog-closed=\"closeOrderingPanel\"></deploy-image-dialog>\n" +
     "<from-file-dialog ng-if=\"ordering.panelName === 'fromFile'\" project=\"currentProject\" context=\"context\" on-dialog-closed=\"closeOrderingPanel\"></from-file-dialog>\n" +
-    "<process-template-dialog ng-if=\"ordering.panelName === 'fromProject'\" project=\"project\" use-project-template=\"true\" on-dialog-closed=\"closeOrderingPanel\"></process-template-dialog>\n" +
+    "<process-template-dialog ng-if=\"ordering.panelName === 'fromProject'\" project=\"currentProject\" use-project-template=\"true\" on-dialog-closed=\"closeOrderingPanel\"></process-template-dialog>\n" +
     "</overlay-panel>"
   );