diff --git a/src/c3nav/editor/api.py b/src/c3nav/editor/api.py
index f59709f2..6f52c30c 100644
--- a/src/c3nav/editor/api.py
+++ b/src/c3nav/editor/api.py
@@ -9,7 +9,7 @@ from rest_framework.viewsets import ReadOnlyModelViewSet, ViewSet
 from shapely.ops import cascaded_union
 
 from c3nav.editor.models import ChangeSet
-from c3nav.mapdata.models import Area, Source
+from c3nav.mapdata.models import Area, Door, Source
 from c3nav.mapdata.models.geometry.space import POI
 
 
@@ -84,7 +84,8 @@ class EditorViewSet(ViewSet):
             levels = Level.objects.filter(pk__in=levels).filter(Level.q_for_request(request))
             levels = levels.prefetch_related(
                 Prefetch('spaces', request.changeset.wrap_model('Space').objects.filter(Space.q_for_request(request))),
-                'buildings', 'doors', 'spaces__holes', 'spaces__groups', 'spaces__columns'
+                Prefetch('doors', request.changeset.wrap_model('Door').objects.filter(Door.q_for_request(request))),
+                'buildings', 'spaces__holes', 'spaces__groups', 'spaces__columns'
             )
 
             levels = {s.pk: s for s in levels}
@@ -106,7 +107,8 @@ class EditorViewSet(ViewSet):
             space = get_object_or_404(qs.select_related('level', 'level__on_top_of'), pk=space)
             level = space.level
 
-            doors = [door for door in level.doors.all() if door.geometry.intersects(space.geometry)]
+            doors = [door for door in level.doors.filter(Door.q_for_request(request)).all()
+                     if door.geometry.intersects(space.geometry)]
             doors_space_geom = cascaded_union([door.geometry for door in doors]+[space.geometry])
 
             levels, levels_on_top, levels_under = self._get_levels_pk(request, level.primary_level)
diff --git a/src/c3nav/mapdata/migrations/0028_door_access_restriction.py b/src/c3nav/mapdata/migrations/0028_door_access_restriction.py
new file mode 100644
index 00000000..fb12bf2a
--- /dev/null
+++ b/src/c3nav/mapdata/migrations/0028_door_access_restriction.py
@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.2 on 2017-07-13 21:42
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+def door_access_restriction(apps, schema_editor):
+    Level = apps.get_model('mapdata', 'Level')
+    for level in Level.objects.all():
+        spaces = level.spaces.all()
+        for door in level.doors.all():
+            public = 0
+            for space in spaces:
+                if space.access_restriction_id is None and space.geometry.intersects(door.geometry):
+                    public += 1
+                    if public == 2:
+                        break
+            else:
+                door.access_restriction_id = 1
+                door.save()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mapdata', '0027_access_restriction'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='door',
+            name='access_restriction',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='doors', to='mapdata.AccessRestriction', verbose_name='Access Restriction'),
+        ),
+        migrations.RunPython(door_access_restriction),
+    ]
diff --git a/src/c3nav/mapdata/models/geometry/level.py b/src/c3nav/mapdata/models/geometry/level.py
index 8dece6c6..104c1566 100644
--- a/src/c3nav/mapdata/models/geometry/level.py
+++ b/src/c3nav/mapdata/models/geometry/level.py
@@ -2,6 +2,7 @@ from django.db import models
 from django.utils.translation import ugettext_lazy as _
 
 from c3nav.mapdata.fields import GeometryField
+from c3nav.mapdata.models.access import AccessRestrictionMixin
 from c3nav.mapdata.models.geometry.base import GeometryMixin
 from c3nav.mapdata.models.locations import SpecificLocation
 
@@ -55,7 +56,7 @@ class Space(SpecificLocation, LevelGeometryMixin, models.Model):
         default_related_name = 'spaces'
 
 
-class Door(LevelGeometryMixin, models.Model):
+class Door(AccessRestrictionMixin, LevelGeometryMixin, models.Model):
     """
     A connection between two spaces
     """