diff --git a/locking/admin.py b/locking/admin.py
index 0ee0be5..6713023 100644
--- a/locking/admin.py
+++ b/locking/admin.py
@@ -23,6 +23,9 @@ def media(self):
         # 
         # See http://docs.djangoproject.com/en/dev/topics/forms/media/#media-as-a-dynamic-property
         # for more information about dynamic media definitions.
+
+        ## Pull in admin media from ModelAdmin
+        super_media = super(LockableAdmin, self)._media()
         
         css = {
             'all': ('locking/css/locking.css',)
@@ -35,7 +38,7 @@ def media(self):
             'locking/js/admin.locking.js',
             )
         
-        return forms.Media(css=css, js=js)
+        return super_media + forms.Media(css=css, js=js)
     
     def changelist_view(self, request, extra_context=None):
         # we need the request objects in a few places where it's usually not present, 
@@ -70,4 +73,4 @@ def lock(self, obj):
             return ''
     lock.allow_tags = True
     
-    list_display = ('__str__', 'lock')
\ No newline at end of file
+    list_display = ('__str__', 'lock')