diff --git a/share/urls.py b/share/urls.py
index 5523256ec8..80897b8179 100644
--- a/share/urls.py
+++ b/share/urls.py
@@ -4,6 +4,6 @@ from views import *
 
 urlpatterns = patterns('',
     url(r'^add/$', share_repo, name='share_repo'),
-    url('^remove/(?P<token>.+)/$', remove_anonymous_share, name='remove_anonymous_share'),
-    url('^(?P<token>.+)/$', anonymous_share_confirm, name='anonymous_share_confirm'),
+    url('^remove/(?P<token>[^/]{24,24})/$', remove_anonymous_share, name='remove_anonymous_share'),
+    url('^(?P<token>[^/]{24,24})/$', anonymous_share_confirm, name='anonymous_share_confirm'),
 )
diff --git a/urls.py b/urls.py
index bc887823dc..8d43e2d193 100644
--- a/urls.py
+++ b/urls.py
@@ -56,7 +56,7 @@ urlpatterns = patterns('',
     (r'^repo/upload_error/(?P<repo_id>[^/]+)/$', upload_file_error),
     (r'^repo/update_error/(?P<repo_id>[^/]+)/$', update_file_error),
     url(r'^repo/file_revisions/(?P<repo_id>[^/]+)/$', file_revisions, name='file_revisions'),
-    url(r'^repo/(?P<repo_id>[^/]+)/$', RepoView.as_view(), name='repo'),
+    url(r'^repo/(?P<repo_id>[^/]{36,36})/$', RepoView.as_view(), name='repo'),
     (r'^repo/history/(?P<repo_id>[^/]+)/$', repo_history),
     (r'^repo/history/revert/(?P<repo_id>[^/]+)/$', repo_history_revert),
     url(r'^repo/history/view/(?P<repo_id>[^/]+)/$', RepoHistoryView.as_view(), name='repo_history_view'),