diff --git a/templates/tracker/issue_base.html b/templates/tracker/issue_base.html
index db73344..ff6a6bd 100644
--- a/templates/tracker/issue_base.html
+++ b/templates/tracker/issue_base.html
@@ -10,7 +10,7 @@
     <a href="{% url 'list-issue' project.name %}?q={% if is_all_query %}{{ is_all_query }}{% else %}*{% endif %}{{ sort }}" class="btn btn-default{{ is_all }}">All</a>
   </div>
   {% if perm.create_issue %}
-  <a href="{% url 'add-issue' project.name %}" class="btn btn-success">New issue</a>
+  <a href="{% url 'add-issue' project.name %}?prev={{ request.get_full_path }}" class="btn btn-success">New issue</a>
   {% endif %}
 </div>
 {% endblock %}
diff --git a/templates/tracker/issue_edit.html b/templates/tracker/issue_edit.html
index 238cb62..f945699 100644
--- a/templates/tracker/issue_edit.html
+++ b/templates/tracker/issue_edit.html
@@ -37,7 +37,7 @@
           {% if issue %}
           <a href="{% url 'show-issue' project.name issue.id %}" class="btn btn-default">Cancel</a>
           {% else %}
-          <a href="{% url 'list-issue' project.name %}" class="btn btn-default">Cancel</a>
+          <a href="{% if request.GET.prev %}{{ request.GET.prev }}{% else %}{% url 'list-issue' project.name %}{% endif %}" class="btn btn-default">Cancel</a>
           {% endif %}
         </div>
       </div>