diff --git a/bundles/org.eclipse.tools.templates.ui/src/org/eclipse/tools/templates/ui/TemplateSelectionPage.java b/bundles/org.eclipse.tools.templates.ui/src/org/eclipse/tools/templates/ui/TemplateSelectionPage.java
index ba9cc1447d2..a6f6ab6ed60 100644
--- a/bundles/org.eclipse.tools.templates.ui/src/org/eclipse/tools/templates/ui/TemplateSelectionPage.java
+++ b/bundles/org.eclipse.tools.templates.ui/src/org/eclipse/tools/templates/ui/TemplateSelectionPage.java
@@ -60,6 +60,7 @@ public class TemplateSelectionPage extends WizardPage {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
 				setPageComplete(templateTable.getSelectedTemplate() != null);
+				getContainer().updateButtons();
 			}
 
 			@Override
@@ -88,7 +89,7 @@ public class TemplateSelectionPage extends WizardPage {
 		templateTable.setTemplates(templates);
 		tagList.setInput(tags);
 		tagList.getList().select(0);
-
+		
 		form.setWeights(new int[] { 20, 80 });
 	}