diff --git a/app/kubernetes/views/deploy/deploy.html b/app/kubernetes/views/deploy/deploy.html
index 36f21126f..7500f5ee4 100644
--- a/app/kubernetes/views/deploy/deploy.html
+++ b/app/kubernetes/views/deploy/deploy.html
@@ -125,6 +125,7 @@
                     stack-type="3"
                     on-change="(ctrl.onChangeTemplateId)"
                     value="ctrl.state.templateId"
+                    is-load-failed="ctrl.state.BuildMethod === ctrl.BuildMethods.CUSTOM_TEMPLATE && ctrl.state.templateId && ctrl.state.templateLoadFailed"
                   ></custom-template-selector>
 
                   <custom-templates-variables-field
@@ -132,7 +133,6 @@
                     definitions="ctrl.state.template.Variables"
                     value="ctrl.formValues.Variables"
                     on-change="(ctrl.onChangeTemplateVariables)"
-                    is-load-failed="ctrl.state.BuildMethod === ctrl.BuildMethods.CUSTOM_TEMPLATE && ctrl.state.templateId && ctrl.state.templateLoadFailed"
                   ></custom-templates-variables-field>
                 </div>
 
diff --git a/app/portainer/components/custom-template-selector/custom-template-selector.html b/app/portainer/components/custom-template-selector/custom-template-selector.html
index 36b4b5429..ce05aa1ce 100644
--- a/app/portainer/components/custom-template-selector/custom-template-selector.html
+++ b/app/portainer/components/custom-template-selector/custom-template-selector.html
@@ -1,7 +1,7 @@
 <div>
   <div class="form-group pt-3">
     <label for="stack_template" class="col-sm-3 col-lg-2 control-label text-left"> Template </label>
-    <div class="col-sm-8 vertical-center">
+    <div class="col-sm-8 col-sm-8 flex flex-col gap-y-1">
       <select
         ng-if="$ctrl.templates.length"
         data-cy="custom-template-selector"