diff --git a/templates-api/src/main/java/com/itsaky/androidide/templates/ITemplateWidgetViewProvider.kt b/templates-api/src/main/java/com/itsaky/androidide/templates/ITemplateWidgetViewProvider.kt
index d6192dbfc..de887fdd6 100644
--- a/templates-api/src/main/java/com/itsaky/androidide/templates/ITemplateWidgetViewProvider.kt
+++ b/templates-api/src/main/java/com/itsaky/androidide/templates/ITemplateWidgetViewProvider.kt
@@ -52,5 +52,5 @@ interface ITemplateWidgetViewProvider {
    * @param widget The widget to create the view for.
    * @return The view.
    */
-  fun createView(context: Context, widget: Widget<*>): View
+  fun <T> createView(context: Context, widget: Widget<T>): View
 }
\ No newline at end of file
diff --git a/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/TemplateWidgetViewProviderImpl.kt b/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/TemplateWidgetViewProviderImpl.kt
index e2c59adfc..a1e34b386 100644
--- a/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/TemplateWidgetViewProviderImpl.kt
+++ b/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/TemplateWidgetViewProviderImpl.kt
@@ -30,6 +30,7 @@ import com.itsaky.androidide.templates.EnumParameter
 import com.itsaky.androidide.templates.ITemplateWidgetViewProvider
 import com.itsaky.androidide.templates.Parameter
 import com.itsaky.androidide.templates.Parameter.DefaultObserver
+import com.itsaky.androidide.templates.ParameterWidget
 import com.itsaky.androidide.templates.SpinnerWidget
 import com.itsaky.androidide.templates.StringParameter
 import com.itsaky.androidide.templates.TextFieldParameter
@@ -66,7 +67,10 @@ class TemplateWidgetViewProviderImpl : ITemplateWidgetViewProvider {
     }
   }
 
-  override fun createView(context: Context, widget: Widget<*>): View {
+  override fun <T> createView(context: Context, widget: Widget<T>): View {
+    if (widget is ParameterWidget<T>) {
+      widget.parameter.setValue(widget.parameter.default)
+    }
     return when (widget) {
       is TextFieldWidget -> createTextField(context, widget)
       is CheckBoxWidget -> createCheckBox(context, widget)