diff --git a/core/modules/block_content/src/BlockContentAccessControlHandler.php b/core/modules/block_content/src/BlockContentAccessControlHandler.php
index 00f05151b0..d49e951697 100644
--- a/core/modules/block_content/src/BlockContentAccessControlHandler.php
+++ b/core/modules/block_content/src/BlockContentAccessControlHandler.php
@@ -54,13 +54,22 @@ public static function createInstance(ContainerInterface $container, EntityTypeI
    * {@inheritdoc}
    */
   protected function checkAccess(EntityInterface $entity, $operation, AccountInterface $account) {
+    // Allow view and update access to user with the 'edit any (type) block'
+    // permission or the 'administer blocks' permission.
+    $permission = 'edit any ' . $entity->bundle() . ' block';
     if ($operation === 'view') {
       $access = AccessResult::allowedIf($entity->isPublished())
-        ->orIf(AccessResult::allowedIfHasPermission($account, 'administer blocks'));
+        ->orIf(AccessResult::allowedIfHasPermission($account, 'administer blocks'))
+        ->orIf(AccessResult::allowedIfHasPermission($account, $permission));
+    }
+    elseif ($operation === 'update') {
+      $access = AccessResult::allowedIfHasPermission($account, 'administer blocks')
+        ->orIf(AccessResult::allowedIfHasPermission($account, $permission));
     }
     else {
       $access = parent::checkAccess($entity, $operation, $account);
     }
+
     // Add the entity as a cacheable dependency because access will at least be
     // determined by whether the block is reusable.
     $access->addCacheableDependency($entity);
diff --git a/core/modules/block_content/tests/src/Kernel/BlockContentAccessHandlerTest.php b/core/modules/block_content/tests/src/Kernel/BlockContentAccessHandlerTest.php
index 0c4c0a4493..f4dfc05826 100644
--- a/core/modules/block_content/tests/src/Kernel/BlockContentAccessHandlerTest.php
+++ b/core/modules/block_content/tests/src/Kernel/BlockContentAccessHandlerTest.php
@@ -184,6 +184,22 @@ public function providerTestAccess() {
         NULL,
         'allowed',
       ],
+      'view:unpublished:reusable:per-block-editor:basic' => [
+        'view',
+        FALSE,
+        TRUE,
+        ['edit any basic block'],
+        NULL,
+        'neutral',
+      ],
+      'view:unpublished:reusable:per-block-editor:square' => [
+        'view',
+        FALSE,
+        TRUE,
+        ['edit any square block'],
+        NULL,
+        'allowed',
+      ],
       'view:published:reusable:admin' => [
         'view',
         TRUE,
@@ -192,6 +208,22 @@ public function providerTestAccess() {
         NULL,
         'allowed',
       ],
+      'view:published:reusable:per-block-editor:basic' => [
+        'view',
+        TRUE,
+        TRUE,
+        ['edit any basic block'],
+        NULL,
+        'allowed',
+      ],
+      'view:published:reusable:per-block-editor:square' => [
+        'view',
+        TRUE,
+        TRUE,
+        ['edit any square block'],
+        NULL,
+        'allowed',
+      ],
       'view:published:non_reusable' => [
         'view',
         TRUE,
@@ -291,8 +323,62 @@ public function providerTestAccess() {
           'forbidden',
           'forbidden',
         ],
+        $operation . ':unpublished:reusable:per-block-editor:basic' => [
+          $operation,
+          FALSE,
+          TRUE,
+          ['edit any basic block'],
+          NULL,
+          'neutral',
+        ],
+        $operation . ':published:reusable:per-block-editor:basic' => [
+          $operation,
+          TRUE,
+          TRUE,
+          ['edit any basic block'],
+          NULL,
+          'neutral',
+        ],
       ];
     }
+
+    $cases += [
+      'update:unpublished:reusable:per-block-editor:square' => [
+        'update',
+        FALSE,
+        TRUE,
+        ['edit any square block'],
+        NULL,
+        'allowed',
+      ],
+      'update:published:reusable:per-block-editor:square' => [
+        'update',
+        TRUE,
+        TRUE,
+        ['edit any square block'],
+        NULL,
+        'allowed',
+      ],
+    ];
+
+    $cases += [
+      'delete:unpublished:reusable:per-block-editor:square' => [
+        'delete',
+        FALSE,
+        TRUE,
+        ['edit any square block'],
+        NULL,
+        'neutral',
+      ],
+      'delete:published:reusable:per-block-editor:square' => [
+        'delete',
+        TRUE,
+        TRUE,
+        ['edit any square block'],
+        NULL,
+        'neutral',
+      ],
+    ];
     return $cases;
   }