diff --git a/templates/repo.html b/templates/repo.html
index d77cd8d1fd..222c0d5452 100644
--- a/templates/repo.html
+++ b/templates/repo.html
@@ -310,6 +310,7 @@ $('.file-rename, .dir-rename').click(function () {
         name = $(this).attr('data');
     $('#rename-target').html(type + name);
     $('input[name="oldname"]').val(name);
+    $('input[name="newname"]').val(name);
     $('#rename-form').modal({appendTo:'#main'});
     return false;
 });
diff --git a/views.py b/views.py
index 1f148a83f7..a1e15db5de 100644
--- a/views.py
+++ b/views.py
@@ -1637,6 +1637,12 @@ def repo_rename_file(request):
         error_msg = u"新文件名不能为空"
         return render_error(request, error_msg)
 
+    if newname == oldname:
+        url = reverse('repo', args=[repo_id]) + ('?p=%s' % parent_dir)
+        return HttpResponseRedirect(url)
+
+    newname = check_filename_with_rename(repo_id, parent_dir, newname)
+
     if len(newname) > settings.MAX_UPLOAD_FILE_NAME_LEN:
         error_msg = u"新文件名太长"
         return render_error(request, error_msg)