diff --git a/templates/permission_error.html b/templates/permission_error.html
new file mode 100644
index 0000000000..5a3d7f6777
--- /dev/null
+++ b/templates/permission_error.html
@@ -0,0 +1,8 @@
+{% extends "myhome_base.html" %}
+
+{% block title %}Permission Error{% endblock %}
+
+{% block main_panel %}
+
+<p>Permission Error.</p>
+{% endblock %}
diff --git a/views.py b/views.py
index bfdfffafd0..966c26bd11 100644
--- a/views.py
+++ b/views.py
@@ -152,12 +152,12 @@ def modify_token(request, repo_id):
 @login_required
 def remove_repo(request, repo_id):
     cid = request.user.user_id
-    if not seafserv_rpc.is_repo_owner(cid, repo_id) or not request.user.is_staff:
-        return HttpResponseRedirect(reverse(repo, args=[repo_id]))
+    if not seafserv_rpc.is_repo_owner(cid, repo_id) and not request.user.is_staff:
+        return render_to_response('permission_error.html', {
+            }, context_instance=RequestContext(request))
 
     seafserv_rpc.remove_repo(repo_id)
-
-    return HttpResponseRedirect(reverse(myhome))
+    return HttpResponseRedirect(request.META['HTTP_REFERER'])
     
 
 @login_required