diff --git a/pagure/lib/__init__.py b/pagure/lib/__init__.py
index 728e00a..08d9781 100644
--- a/pagure/lib/__init__.py
+++ b/pagure/lib/__init__.py
@@ -1231,6 +1231,8 @@ def edit_issue(session, issue, ticketfolder, user,
         edit.append('content')
     if status and status != issue.status:
         issue.status = status
+        if status.lower() != 'open':
+            issue.closed_at = datetime.datetime.utcnow()
         edit.append('status')
     if priority:
         try:
diff --git a/pagure/templates/issues.html b/pagure/templates/issues.html
index b1c4330..c963f50 100644
--- a/pagure/templates/issues.html
+++ b/pagure/templates/issues.html
@@ -86,6 +86,9 @@
         <tr>
             <th id="issue-title">Issue</th>
             <th class="open_date">Opened</th>
+            {% if status and status|lower != 'open' %}
+            <th class="close_date">Closed</th>
+            {% endif %}
             <th class="priority" data-sort="int">
                 Priority&nbsp;(<a href="{{ url_for('view_issues', username=username,
                 repo=repo.name, tags=tags, author=author, assignee=assignee,
@@ -140,6 +143,14 @@
                 <span title="{{issue.date_created.strftime('%Y-%m-%d %H:%M:%S')}}">{{
                         issue.date_created | humanize}}</span>
             </td>
+            {% if status|lower != 'open' %}
+            <td class="nowrap">
+                {% if issue.closed_at != None %}
+                <span title="{{issue.closed_at.strftime('%Y-%m-%d %H:%M:%S')}}">{{
+                        issue.closed_at | humanize}}</span>
+                {% endif %}
+            </td>
+            {% endif %}
             <td class="td-priority nowrap" data-sort-value="{{
               issue.priority
               if issue.priority