diff --git a/pagure/templates/issues.html b/pagure/templates/issues.html
index b8c5841..c7924b1 100644
--- a/pagure/templates/issues.html
+++ b/pagure/templates/issues.html
@@ -328,6 +328,10 @@
   data-toggle="modal" data-target="#report_modal">
   Save report
 </button>
+<button type="button" class="btn btn-secondary btn-sm pull-xs-right"
+  data-toggle="modal" data-target="#milestone_modal">
+  Add milestone
+</button>
 <div class="modal fade" id="report_modal" tabindex="-1"
       role="dialog" aria-labelledby="New report" aria-hidden="true">
   <div class="modal-dialog" role="document">
@@ -357,6 +361,24 @@
     </div>
   </div>
 </div>
+<div class="modal fade" id="milestone_modal" tabindex="-1"
+      role="dialog" aria-labelledby="New milestone" aria-hidden="true">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+          <span class="sr-only">Close</span>
+        </button>
+      </div>
+      <div class="modal-body">
+    {% set tag_form = add_report_form %}
+    {% set from = 'issues' %}
+    {% include 'settings_milestones.html' %}
+      </div>
+    </div>
+  </div>
+</div>
 {% endif %}
 
 {{ pagination_link('page', g.page, total_page) }}
@@ -394,7 +416,13 @@ $(document).ready(function() {
       _b.hide();
       _s.hide();
     }
+  });
 
+  $('.extend-form').click(function(e) {
+    const tgt = $(this).attr('data-target');
+    let form = $(tgt + ' > div:last-child').clone();
+    form.find('input[type=text], textarea').val('');
+    $(tgt).append(form);
   });
 });
 </script>
diff --git a/pagure/templates/settings.html b/pagure/templates/settings.html
index 4b0b569..af0d74e 100644
--- a/pagure/templates/settings.html
+++ b/pagure/templates/settings.html
@@ -709,67 +709,7 @@
     </div>
 
     <div class="col-md-8 col-md-offset-2">
-      <div class="card">
-        <div class="card-header">
-          <strong>Roadmap</strong>
-        </div>
-        <div class="card-block">
-          <p>
-            Each issue can be assigned to a <em>milestone</em>. This way it is
-            possible to create a roadmap for your project. Below you can create
-            the milestones and optionally set dates for them.
-          </p>
-        </div>
-        <form action="{{ url_for(
-              '.update_milestones',
-              repo=repo.name,
-              username=username,
-              namespace=repo.namespace) }}"
-            method="post" class="icon">
-          {{ tag_form.csrf_token }}
-          <div class="card-block">
-            <div class="row">
-              <div class="col-sm-6">
-                <strong>Milestone</strong>
-              </div>
-              <div class="col-sm-6">
-                <strong>Date (optional)</strong>
-              </div>
-            </div>
-            <div id="milestones">
-          {% for milestone in repo.milestones or [""] | sort %}
-              <div class="row p-t-1">
-                <div class="col-sm-6 p-r-0">
-                  <input type="text" name="milestones"
-                    value="{{ milestone }}" size="3" class="form-control"/>
-                </div>
-                <div class="col-sm-6 p-r-0">
-                  <input type="text" name="milestone_dates"
-                    value="{{ repo.milestones[milestone]
-                        if repo.milestones[milestone] is not none
-                    }}" class="form-control"/>
-                </div>
-              </div>
-          {% endfor %}
-          </div>
-          <div class="row p-t-1">
-            <div class="col-sm-6">
-              <a class="btn btn-secondary btn-sm btn-block extend-form" data-target="#milestones">
-                  Add new milestone
-              </a>
-            </div>
-          </div>
-          <div class="row p-t-1">
-            <div class="col-sm-12">
-              <button class="btn btn-primary" type="submit"
-                  title="Update the milestones">
-                Update
-              </button>
-            </div>
-          </div>
-        </div>
-        </form>
-      </div>
+      {% include 'settings_milestones.html' %}
     </div>
 
     <div class="col-md-8 col-md-offset-2">
diff --git a/pagure/templates/settings_milestones.html b/pagure/templates/settings_milestones.html
new file mode 100644
index 0000000..2e3e8f7
--- /dev/null
+++ b/pagure/templates/settings_milestones.html
@@ -0,0 +1,63 @@
+
+
+      <div class="card">
+        <div class="card-header">
+          <strong>Roadmap</strong>
+        </div>
+        <div class="card-block">
+          <p>
+            Each issue can be assigned to a <em>milestone</em>. This way it is
+            possible to create a roadmap for your project. Below you can create
+            the milestones and optionally set dates for them.
+          </p>
+        </div>
+        <form action="{{ url_for(
+              '.update_milestones',
+              repo=repo.name,
+              username=username,
+              namespace=repo.namespace, from=from or None) }}"
+            method="post" class="icon">
+          {{ tag_form.csrf_token }}
+          <div class="card-block">
+            <div class="row">
+              <div class="col-sm-6">
+                <strong>Milestone</strong>
+              </div>
+              <div class="col-sm-6">
+                <strong>Date (optional)</strong>
+              </div>
+            </div>
+            <div id="milestones">
+          {% for milestone in repo.milestones or [""] | sort %}
+              <div class="row p-t-1">
+                <div class="col-sm-6 p-r-0">
+                  <input type="text" name="milestones"
+                    value="{{ milestone }}" size="3" class="form-control"/>
+                </div>
+                <div class="col-sm-6 p-r-0">
+                  <input type="text" name="milestone_dates"
+                    value="{{ repo.milestones[milestone]
+                        if repo.milestones[milestone] is not none
+                    }}" class="form-control"/>
+                </div>
+              </div>
+          {% endfor %}
+          </div>
+          <div class="row p-t-1">
+            <div class="col-sm-6">
+              <a class="btn btn-secondary btn-sm btn-block extend-form" data-target="#milestones">
+                  Add new milestone
+              </a>
+            </div>
+          </div>
+          <div class="row p-t-1">
+            <div class="col-sm-12">
+              <button class="btn btn-primary" type="submit"
+                  title="Update the milestones">
+                Update
+              </button>
+            </div>
+          </div>
+        </div>
+        </form>
+      </div>
diff --git a/pagure/ui/repo.py b/pagure/ui/repo.py
index 0329cdb..fe211ba 100644
--- a/pagure/ui/repo.py
+++ b/pagure/ui/repo.py
@@ -1373,6 +1373,7 @@ def update_milestones(repo, username=None, namespace=None):
 
     error = False
     if form.validate_on_submit():
+        redirect = flask.request.args.get('from')
         milestones = [
             w.strip() for w in flask.request.form.getlist('milestones')
         ]
@@ -1422,6 +1423,11 @@ def update_milestones(repo, username=None, namespace=None):
                 SESSION.rollback()
                 flask.flash(str(err), 'error')
 
+        if redirect == 'issues':
+            return flask.redirect(flask.url_for(
+                'view_issues', username=username, repo=repo.name,
+                namespace=namespace))
+
     return flask.redirect(flask.url_for(
         'view_settings', username=username, repo=repo.name,
         namespace=namespace))