diff --git a/templates/file_revisions.html b/templates/file_revisions.html
index 9c856fa597..58cb0d53d2 100644
--- a/templates/file_revisions.html
+++ b/templates/file_revisions.html
@@ -42,7 +42,7 @@
 
         <td>
             {% if not commit.is_current_version %}
-            <a href="{{ SITE_ROOT }}repo/revert_file/{{ repo.id }}/?commit={{ commit.id }}&p={{path|urlencode}}" class="file-revert op">还原</a>
+            <a href="{{ SITE_ROOT }}repo/revert_file/{{ repo.id }}/?commit={{ commit.id }}&p={{path|urlencode}}&from=file_revisions" class="file-revert op">还原</a>
             {% endif %}
             <a href="{{ SITE_ROOT }}repo/file_revisions/{{ repo.id }}/?commit={{ commit.id }}&p={{path|urlencode}}&op=download" class="file-download op">下载</a>
             <a href="{{ SITE_ROOT }}repo/file_revisions/{{ repo.id }}/?commit={{ commit.id }}&p={{path|urlencode}}&op=view" class="file-download op">查看</a>
diff --git a/templates/repo.html b/templates/repo.html
index df6d667cc1..0bf1797c1e 100644
--- a/templates/repo.html
+++ b/templates/repo.html
@@ -184,7 +184,7 @@
                           <li><a class="op file-update" href="{{ SITE_ROOT }}repo/update_file/{{repo.id}}/?p={{ path|urlencode }}{{dirent.obj_name|urlencode}}">更新</a></li>
                           {% endif %}
                           {% if view_history and request.user.is_authenticated %}
-                          <li><a href="{{ SITE_ROOT }}repo/revert_file/{{ repo.id }}/?commit={{ current_commit.id }}&p={{path|urlencode}}{{ dirent.obj_name|urlencode }}" class="op file-revert">还原</a></li>
+                          <li><a href="{{ SITE_ROOT }}repo/revert_file/{{ repo.id }}/?commit={{ current_commit.id }}&p={{path|urlencode}}{{ dirent.obj_name|urlencode }}&from=repo_history" class="op file-revert">还原</a></li>
                           {% endif %}
                       </ul>
                   </div>
diff --git a/views.py b/views.py
index 5adad0d4d2..b17ba17240 100644
--- a/views.py
+++ b/views.py
@@ -1801,8 +1801,9 @@ def render_file_revisions (request, repo_id):
 def repo_revert_file (request, repo_id):
     commit_id = request.GET.get('commit')
     path      = request.GET.get('p')
+    from_page = request.GET.get('from')
 
-    if not (commit_id and path):
+    if not (commit_id and path and from_page):
         return render_error(request, u"参数错误")
 
     try:
@@ -1811,8 +1812,13 @@ def repo_revert_file (request, repo_id):
     except Exception, e:
         return render_error(request, str(e))
     else:
-        parent_dir = os.path.dirname(path)
-        url = reverse('repo', args=[repo_id]) + ('?p=%s' % urllib2.quote(parent_dir.encode('utf-8')))
+        if from_page == 'repo_history':
+            # When revert file from repo history, we redirect to repo history
+            url = reverse('repo', args=[repo_id]) + u'?commit_id=%s&history=y' % commit_id
+        else:
+            # When revert file from file history, we redirect to parent dir of this file
+            parent_dir = os.path.dirname(path)
+            url = reverse('repo', args=[repo_id]) + ('?p=%s' % urllib2.quote(parent_dir.encode('utf-8')))
 
         file_view_url = reverse('repo_view_file', args=[repo_id]) + u'?p=' + urllib2.quote(path.encode('utf-8'))
         if ret == 1: