diff --git a/modules/gallery/helpers/access.php b/modules/gallery/helpers/access.php
index 8c6f5d544b..949aea840d 100644
--- a/modules/gallery/helpers/access.php
+++ b/modules/gallery/helpers/access.php
@@ -95,7 +95,7 @@ static function user_can($user, $perm_name, $item) {
       return false;
     }
 
-    if ($user->admin && $item->owner_id == $user->id) {
+    if ($user->admin) {
       return true;
     }
 
diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php
index 4556138036..d9dd88f58e 100644
--- a/modules/gallery/models/item.php
+++ b/modules/gallery/models/item.php
@@ -38,17 +38,31 @@ public function viewable() {
       if (user::active()->admin) {
         $this->view_restrictions = array();
       } else {
-        $this->view_restrictions["owner_id"] = user::active()->id;
         foreach (user::group_ids() as $id) {
-          $this->view_restrictions["view_$id"] = access::ALLOW;
+          // Separate the first restriction from the rest to make it easier for us to formulate
+          // our where clause below
+          if (empty($this->view_restrictions)) {
+            $this->view_restrictions[0] = "view_$id";
+          } else {
+            $this->view_restrictions[1]["view_$id"] = access::ALLOW;
+          }
         }
       }
     }
+    switch (count($this->view_restrictions)) {
+    case 0:
+      break;
 
-    if (!empty($this->view_restrictions)) {
+    case 1:
+      $this->where($this->view_restrictions[0], access::ALLOW);
+      break;
+
+    default:
       $this->open_paren();
-      $this->orwhere($this->view_restrictions);
+      $this->where($this->view_restrictions[0], access::ALLOW);
+      $this->orwhere($this->view_restrictions[1]);
       $this->close_paren();
+      break;
     }
 
     return $this;