diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go
index 7ab9d62b69..0373d06ea0 100644
--- a/routers/web/repo/issue.go
+++ b/routers/web/repo/issue.go
@@ -2414,6 +2414,7 @@ func UpdateIssueMilestone(ctx *context.Context) {
 				ctx.ServerError("GetMilestoneByRepoID", err)
 				return
 			}
+			ctx.Data["OpenMilestones"] = true
 		} else {
 			issue.Milestone = nil
 		}
diff --git a/templates/htmx/milestone_sidebar.tmpl b/templates/htmx/milestone_sidebar.tmpl
index 87eb5a7f42..3898ebd058 100644
--- a/templates/htmx/milestone_sidebar.tmpl
+++ b/templates/htmx/milestone_sidebar.tmpl
@@ -1,3 +1,4 @@
+{{template "repo/issue/milestone/clear_milestone" dict "." . "UseHTMX" true}}
 <div id="insert-timeline" hx-swap-oob="beforebegin">
 	{{template "repo/issue/view_content/comments" .}}
 </div>
diff --git a/templates/repo/issue/milestone/clear_milestone.tmpl b/templates/repo/issue/milestone/clear_milestone.tmpl
new file mode 100644
index 0000000000..eb1b21fbfe
--- /dev/null
+++ b/templates/repo/issue/milestone/clear_milestone.tmpl
@@ -0,0 +1,3 @@
+<div hx-swap-oob="true" id="clear-milestone" class="{{if and .UseHTMX (or (and (not .OpenMilestones) (not .ClosedMilestones)) (not .Issue.Milestone))}}disabled {{end}}no-select item"{{if .UseHTMX}} hx-post="{{$.RepoLink}}/issues/milestone?issue_ids={{.Issue.ID}}&htmx=true"{{end}}>
+	{{ctx.Locale.Tr "repo.issues.new.clear_milestone"}}
+</div>
diff --git a/templates/repo/issue/milestone/select_menu.tmpl b/templates/repo/issue/milestone/select_menu.tmpl
index 570acc2eee..19b0049578 100644
--- a/templates/repo/issue/milestone/select_menu.tmpl
+++ b/templates/repo/issue/milestone/select_menu.tmpl
@@ -6,7 +6,7 @@
 	</div>
 	<div class="divider"></div>
 {{end}}
-<div class="no-select item"{{if $useHTMX}} hx-post="{{$.RepoLink}}/issues/milestone?issue_ids={{$.Issue.ID}}&htmx=true"{{end}}>{{ctx.Locale.Tr "repo.issues.new.clear_milestone"}}</div>
+{{template "repo/issue/milestone/clear_milestone" dict "." . "UseHTMX" $useHTMX}}
 {{if and (not .OpenMilestones) (not .ClosedMilestones)}}
 	<div class="disabled item">
 		{{ctx.Locale.Tr "repo.issues.new.no_items"}}
diff --git a/templates/repo/issue/milestone/selected.tmpl b/templates/repo/issue/milestone/selected.tmpl
index c5ed4c81af..68acf1023c 100644
--- a/templates/repo/issue/milestone/selected.tmpl
+++ b/templates/repo/issue/milestone/selected.tmpl
@@ -1,4 +1,4 @@
-<div id="selected-milestone" class="ui select-milestone list">
+<div hx-swap-oob="true" id="selected-milestone" class="ui select-milestone list">
 		<span class="no-select item {{if .Issue.Milestone}}tw-hidden{{end}}">{{ctx.Locale.Tr "repo.issues.new.no_milestone"}}</span>
 		<div class="selected">
 			{{if .Issue.Milestone}}