diff --git a/app/models/cluster.js b/app/models/cluster.js
index a2b26f1d4..7092c4f04 100644
--- a/app/models/cluster.js
+++ b/app/models/cluster.js
@@ -165,7 +165,7 @@ export default Resource.extend(Grafana, ResourceUsage, {
     const {
       clusterProvider, eksConfig = {}, eksStatus = {}
     } = this;
-    const privateAccess = get(eksConfig, 'privateAccess') || get(eksStatus, 'upstreamSpec.privateAccess') || false;
+    const privateAccess = !get(eksConfig, 'publicAccess') && get(eksConfig, 'privateAccess') || get(eksStatus, 'upstreamSpec.privateAccess') || false;
 
     if (clusterProvider === 'amazoneksv2' && privateAccess) {
       return true;
@@ -178,7 +178,7 @@ export default Resource.extend(Grafana, ResourceUsage, {
     const {
       clusterProvider, eksConfig = {}, eksStatus = {}
     } = this;
-    const privateAccess = get(eksConfig, 'privateAccess') || get(eksStatus, 'upstreamSpec.privateAccess') || false;
+    const privateAccess = !get(eksConfig, 'publicAccess') && get(eksConfig, 'privateAccess') || get(eksStatus, 'upstreamSpec.privateAccess') || false;
     const ignored = ['custom', 'import', 'amazoneksv2'];
 
     if (!ignored.includes(clusterProvider)) {
diff --git a/lib/shared/addon/components/cluster-driver/driver-eks/component.js b/lib/shared/addon/components/cluster-driver/driver-eks/component.js
index b7a8fc40a..51c75bc3f 100644
--- a/lib/shared/addon/components/cluster-driver/driver-eks/component.js
+++ b/lib/shared/addon/components/cluster-driver/driver-eks/component.js
@@ -306,17 +306,17 @@ export default Component.extend(ClusterDriver, {
     const {
       isNew,
       isPostSave,
-      config: { privateAccess }
+      config: { privateAccess, publicAccess }
     } = this;
 
-    if (privateAccess && isPostSave) {
+    if (!publicAccess && privateAccess && isPostSave) {
       if (isNew) {
         set(this, 'step', 5);
-      } else if (this.close) {
-        this.close();
       } else {
-        this.send('close');
+        this.close();
       }
+    } else {
+      this.close();
     }
   }),
 
diff --git a/lib/shared/addon/components/cluster-driver/driver-import-eks/component.js b/lib/shared/addon/components/cluster-driver/driver-import-eks/component.js
index 40873a6cb..c80c30367 100644
--- a/lib/shared/addon/components/cluster-driver/driver-import-eks/component.js
+++ b/lib/shared/addon/components/cluster-driver/driver-import-eks/component.js
@@ -167,7 +167,7 @@ export default Component.extend(ClusterDriver, {
         }
       }
     } = this;
-    const privateAccess = get(eksConfig, 'privateAccess') || get(eksStatus, 'upstreamSpec.privateAccess') || false;
+    const privateAccess = !get(eksConfig, 'publicAccess') && get(eksConfig, 'privateAccess') || get(eksStatus, 'upstreamSpec.privateAccess') || false;
 
     if (isPostSave && privateAccess) {
       set(this, 'step', 3);