diff --git a/pages/c/_cluster/apps/install.vue b/pages/c/_cluster/apps/install.vue
index b00508abf8..d97ea89dd2 100644
--- a/pages/c/_cluster/apps/install.vue
+++ b/pages/c/_cluster/apps/install.vue
@@ -306,6 +306,10 @@ export default {
 
       return EDITOR_MODES.EDIT_CODE;
     },
+
+    hasQuestions() {
+      return this.versionInfo && !!this.versionInfo.questions;
+    }
   },
 
   watch: {
@@ -525,7 +529,7 @@ export default {
     actionInput(isUpgrade) {
       const fromChart = this.versionInfo.values || {};
 
-      if ( !this.valuesComponent ) {
+      if ( !this.valuesComponent && !this.hasQuestions ) {
         try {
           this.chartValues = jsyaml.safeLoad(this.valuesYaml);
         } catch (err) {
@@ -787,7 +791,7 @@ export default {
           </tab>
         </template>
         <Questions
-          v-else-if="versionInfo && versionInfo.questions"
+          v-else-if="hasQuestions"
           v-model="chartValues"
           :chart="chart"
           :version="version"
diff --git a/plugins/steve/resource-instance.js b/plugins/steve/resource-instance.js
index 3a82cbb49b..02b0dafa2a 100644
--- a/plugins/steve/resource-instance.js
+++ b/plugins/steve/resource-instance.js
@@ -958,10 +958,10 @@ export default {
 
       for ( const item of items ) {
         let name = `${ item.nameDisplay }.yaml`;
-        const i = 2;
+        let i = 2;
 
         while ( names.includes(name) ) {
-          name = `${ item.nameDisplay }_${ i }.yaml`;
+          name = `${ item.nameDisplay }_${ i++ }.yaml`;
         }
 
         names.push(name);