diff --git a/pagure/templates/roadmap.html b/pagure/templates/roadmap.html
index cdde25d..60f3837 100644
--- a/pagure/templates/roadmap.html
+++ b/pagure/templates/roadmap.html
@@ -69,7 +69,7 @@
 </span>
 </section>
 
-{% for milestone in issues | sort %}
+{% for milestone in milestones %}
 <div class="card m-t-1">
   <div class="card-header">
     <h5>
diff --git a/pagure/ui/issues.py b/pagure/ui/issues.py
index ae06a30..eb33733 100644
--- a/pagure/ui/issues.py
+++ b/pagure/ui/issues.py
@@ -513,6 +513,11 @@ def view_roadmap(repo, username=None):
 
     reponame = pagure.get_repo_path(repo)
     repo_obj = pygit2.Repository(reponame)
+    milestones_ordered = sorted(list(milestone_issues.keys()))
+    if 'unplaned' in milestones_ordered:
+        index = milestones_ordered.index('unplaned')
+        cnt = len(milestones_ordered)
+        milestones_ordered.insert(cnt, milestones_ordered.pop(index))
 
     return flask.render_template(
         'roadmap.html',
@@ -521,6 +526,7 @@ def view_roadmap(repo, username=None):
         username=username,
         tag_list=tag_list,
         status=status,
+        milestones=milestones_ordered,
         issues=milestone_issues,
         tags=tags,
         repo_admin=is_repo_admin(repo),