diff --git a/pkg/dashboard/api.go b/pkg/dashboard/api.go
index 90e8784..ac93b4e 100644
--- a/pkg/dashboard/api.go
+++ b/pkg/dashboard/api.go
@@ -2,14 +2,15 @@ package dashboard
 
 import (
 	"embed"
+	"net/http"
+	"os"
+	"path"
+
 	"github.com/gin-gonic/gin"
 	"github.com/komodorio/helm-dashboard/pkg/dashboard/handlers"
 	"github.com/komodorio/helm-dashboard/pkg/dashboard/subproc"
 	"github.com/komodorio/helm-dashboard/pkg/dashboard/utils"
 	log "github.com/sirupsen/logrus"
-	"net/http"
-	"os"
-	"path"
 )
 
 //go:embed static/*
@@ -106,6 +107,7 @@ func configureKubectls(api *gin.RouterGroup, data *subproc.DataLayer) {
 	api.GET("/contexts", h.GetContexts)
 	api.GET("/resources/:kind", h.GetResourceInfo)
 	api.GET("/describe/:kind", h.Describe)
+	api.GET("/namespaces", h.GetNameSpaces)
 }
 
 func configureStatic(api *gin.Engine) {
diff --git a/pkg/dashboard/handlers/kubeHandlers.go b/pkg/dashboard/handlers/kubeHandlers.go
index fb0c313..377bc0e 100644
--- a/pkg/dashboard/handlers/kubeHandlers.go
+++ b/pkg/dashboard/handlers/kubeHandlers.go
@@ -1,12 +1,13 @@
 package handlers
 
 import (
+	"net/http"
+
 	"github.com/gin-gonic/gin"
 	"github.com/komodorio/helm-dashboard/pkg/dashboard/subproc"
 	"github.com/komodorio/helm-dashboard/pkg/dashboard/utils"
-	"k8s.io/apimachinery/pkg/apis/meta/v1"
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	v12 "k8s.io/apimachinery/pkg/apis/testapigroup/v1"
-	"net/http"
 )
 
 type KubeHandler struct {
@@ -69,3 +70,13 @@ func (h *KubeHandler) Describe(c *gin.Context) {
 
 	c.String(http.StatusOK, res)
 }
+
+func (h *KubeHandler) GetNameSpaces(c *gin.Context) {
+	res, err := h.Data.GetNameSpaces()
+	if err != nil {
+		_ = c.AbortWithError(http.StatusInternalServerError, err)
+		return
+	}
+
+	c.JSON(http.StatusOK, res)
+}
diff --git a/pkg/dashboard/static/actions.js b/pkg/dashboard/static/actions.js
index e8980e0..f6ba7aa 100644
--- a/pkg/dashboard/static/actions.js
+++ b/pkg/dashboard/static/actions.js
@@ -71,6 +71,18 @@ function popUpUpgrade(elm, ns, name, verCur, lastRev) {
         $("#upgradeModal .rel-ns").prop("disabled", false).val("")
     }
 
+    $.getJSON("/api/kube/namespaces").fail(function (xhr) {
+        reportError("Failed to get namespaces", xhr)
+    }).done(function(res) {
+      const ns = res.items.map(i => i.metadata.name)
+      $.each(ns, function(i, item) {
+        $("#upgradeModal #ns-datalist").append($("<option>", {
+          value: item,
+          text: item
+        }))
+      })
+    })
+
     $.getJSON("/api/helm/repo/search?name=" + elm.name).fail(function (xhr) {
         reportError("Failed to find chart in repo", xhr)
     }).done(function (vers) {
diff --git a/pkg/dashboard/static/index.html b/pkg/dashboard/static/index.html
index dd47791..133645c 100644
--- a/pkg/dashboard/static/index.html
+++ b/pkg/dashboard/static/index.html
@@ -355,7 +355,9 @@
                         Release Name: <input class="form-control rel-name">
                     </label>
                     <label class="form-label me-4 text-dark">
-                        Namespace (optional): <input class="form-control rel-ns">
+                        Namespace (optional):
+                    <input type="text" class="form-control rel-ns" list="ns-datalist"/>
+                    <datalist id="ns-datalist"></datalist>
                     </label>
                     <label class="form-label me-4 text-dark">
                         Cluster: <span class="form-label rel-cluster"></span>
diff --git a/pkg/dashboard/subproc/data.go b/pkg/dashboard/subproc/data.go
index 3801c12..fd7a929 100644
--- a/pkg/dashboard/subproc/data.go
+++ b/pkg/dashboard/subproc/data.go
@@ -5,6 +5,12 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"regexp"
+	"sort"
+	"strconv"
+	"strings"
+	"time"
+
 	"github.com/hexops/gotextdiff"
 	"github.com/hexops/gotextdiff/myers"
 	"github.com/hexops/gotextdiff/span"
@@ -13,11 +19,6 @@ import (
 	"gopkg.in/yaml.v3"
 	"helm.sh/helm/v3/pkg/release"
 	v1 "k8s.io/apimachinery/pkg/apis/testapigroup/v1"
-	"regexp"
-	"sort"
-	"strconv"
-	"strings"
-	"time"
 )
 
 type DataLayer struct {
@@ -478,6 +479,20 @@ func (d *DataLayer) ChartRepoDelete(name string) (string, error) {
 	return out, nil
 }
 
+func (d *DataLayer) GetNameSpaces() (res *NamespaceElement, err error) {
+	out, err := d.runCommandKubectl("get", "namespaces", "-o", "json")
+	if err != nil {
+		return nil, err
+	}
+
+	err = json.Unmarshal([]byte(out), &res)
+	if err != nil {
+		return nil, err
+	}
+
+	return res, nil
+}
+
 func RevisionDiff(functor SectionFn, ext string, namespace string, name string, revision1 int, revision2 int, flag bool) (string, error) {
 	if revision1 == 0 || revision2 == 0 {
 		log.Debugf("One of revisions is zero: %d %d", revision1, revision2)
diff --git a/pkg/dashboard/subproc/helmTypes.go b/pkg/dashboard/subproc/helmTypes.go
index ec72162..eeebf53 100644
--- a/pkg/dashboard/subproc/helmTypes.go
+++ b/pkg/dashboard/subproc/helmTypes.go
@@ -42,3 +42,11 @@ type RepositoryElement struct {
 	Name string `json:"name"`
 	URL  string `json:"url"`
 }
+
+type NamespaceElement struct {
+	Items []struct {
+		Metadata struct {
+			Name string `json:"name"`
+		} `json:"metadata"`
+	} `json:"items"`
+}