diff --git a/blog/admin.py b/blog/admin.py
index 519c012..d1cd0dd 100644
--- a/blog/admin.py
+++ b/blog/admin.py
@@ -1,11 +1,15 @@
 from django.contrib import admin
 from . import models
 from django_markdown.admin import MarkdownModelAdmin
+from django_markdown.widgets import AdminMarkdownWidget
+from django.db.models import TextField
 
 
 class EntryAdmin(MarkdownModelAdmin):
     list_display = ("title", "created")
     prepopulated_fields = {"slug": ("title",)}
+    # Next line is a workaround for Python 2.x
+    formfield_overrides = {TextField: {'widget': AdminMarkdownWidget}}
 
 admin.site.register(models.Entry, EntryAdmin)
 admin.site.register(models.Tag)
diff --git a/blog/urls.py b/blog/urls.py
index 4eef549..525eb72 100644
--- a/blog/urls.py
+++ b/blog/urls.py
@@ -5,5 +5,5 @@
     '',
     url(r'^feed/$', feed.LatestPosts(), name="feed"),
     url(r'^$', views.BlogIndex.as_view(), name="index"),
-    url(r'^(?P<slug>\S+)$', views.BlogDetail.as_view(), name="entry_detail"),
+    url(r'^entry/(?P<slug>\S+)$', views.BlogDetail.as_view(), name="entry_detail"),
 )