diff --git a/electron/app/js/vzInstaller.js b/electron/app/js/vzInstaller.js
index e00f08207..10723bae5 100644
--- a/electron/app/js/vzInstaller.js
+++ b/electron/app/js/vzInstaller.js
@@ -137,7 +137,9 @@ function _getStatusFromConditions(vzObject, status) {
   }
 
   status.payload = latestCondition;
-  if (latestCondition && latestCondition.type === 'InstallComplete' && Boolean(latestCondition.status)) {
+  if (latestCondition &&
+      (latestCondition.type === 'InstallComplete' || latestCondition.type === 'UpgradeComplete') &&
+      Boolean(latestCondition.status)) {
     status.isComplete = true;
     status.version = version;
     _normalizeVersionData(status);
diff --git a/electron/app/locales/en/webui.json b/electron/app/locales/en/webui.json
index cc6866109..1af10ebbd 100644
--- a/electron/app/locales/en/webui.json
+++ b/electron/app/locales/en/webui.json
@@ -1773,6 +1773,7 @@
 
   "vz-application-status-checker-get-status-failed-title-message": "Get Application Status Failed",
   "vz-application-status-checker-get-status-failed-error-message": "Unable to get the application status due to an error: {{error}}.",
+  "vz-application-status-checker-validate-ns-failed-error-message": "Unable to get the application status because an error occurred while trying to validate the Kubernetes namespace {{namespace}}: {{error}}.",
   "vz-application-status-checker-application-not-exist-error-message": "Unable to get the application status because the application {{application}} does not exist.",
   "vz-application-status-checker-ns-not-exist-error-message": "Unable to get the application status because the application namespace {{namespace}} does not exist.",
   "vz-application-status-checker-domain-not-exist-error-message": "Unable to get the application status because the domain UID {{domain}} does not exist.",
diff --git a/webui/src/js/views/k8s-helper-choose-cluster-dialog.html b/webui/src/js/views/k8s-helper-choose-cluster-dialog.html
index ec5594398..e5aca10e2 100644
--- a/webui/src/js/views/k8s-helper-choose-cluster-dialog.html
+++ b/webui/src/js/views/k8s-helper-choose-cluster-dialog.html
@@ -10,7 +10,7 @@
   </div>
   <div slot="body">
     <div class="oj-panel">
-      <oj-form-layout max-columns="2" direction="row">
+      <oj-form-layout max-columns="1" direction="row">
         <oj-select-single label-hint="[[labelMapper('name-label')]]"
                           value="{{selectedTestClusterName}}"
                           data="{{testClusterNamesDP}}"