diff --git a/mediagoblin/edit/routing.py b/mediagoblin/edit/routing.py
index d7396a60..54f2661a 100644
--- a/mediagoblin/edit/routing.py
+++ b/mediagoblin/edit/routing.py
@@ -17,6 +17,6 @@
 from routes.route import Route
 
 edit_routes = [
-    Route('mediagoblin.edit.edit_media', "/{media}/",
+    Route('mediagoblin.edit.edit_media', "/{user}/{media}/",
         controller="mediagoblin.edit.views:edit_media"),
 ]
diff --git a/mediagoblin/edit/views.py b/mediagoblin/edit/views.py
index e5dccc81..a0afaa30 100644
--- a/mediagoblin/edit/views.py
+++ b/mediagoblin/edit/views.py
@@ -3,7 +3,7 @@
 from webob import Response, exc
 
 from mediagoblin.edit import forms
-from mediagoblin.decorators import require_active_login, get_media_entry_by_id
+from mediagoblin.decorators import require_active_login, get_user_media_entry
 
 
 def may_edit_media(request, media):
@@ -15,7 +15,7 @@ def may_edit_media(request, media):
     return False
     
 
-@get_media_entry_by_id
+@get_user_media_entry
 @require_active_login
 def edit_media(request, media):
     if not may_edit_media(request, media):
diff --git a/mediagoblin/templates/mediagoblin/edit/edit.html b/mediagoblin/templates/mediagoblin/edit/edit.html
index d694ce25..295d57eb 100644
--- a/mediagoblin/templates/mediagoblin/edit/edit.html
+++ b/mediagoblin/templates/mediagoblin/edit/edit.html
@@ -23,6 +23,7 @@
   <h1>Edit details for {{ media.title }}</h1>
 
   <form action="{{ request.urlgen('mediagoblin.edit.edit_media',
+                               user= media.uploader().username,
                                media= media._id) }}"
         method="POST" enctype="multipart/form-data">
     <div class="submit_box form_box">
diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html
index b26e2514..406fd3f6 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/media.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/media.html
@@ -34,6 +34,7 @@
                                user= media.uploader().username) }}">
       {{- media.uploader().username }}</a></p>
     <p><a href="{{ request.urlgen('mediagoblin.edit.edit_media',
+                               user= media.uploader().username,
                                media= media._id) }}">Edit</a></p>
   {% else %}
   <p>Sorry, no such media found.<p/>