diff --git a/vendor/magento/module-admin-gws/Model/Controllers.php b/vendor/magento/module-admin-gws/Model/Controllers.php
index d216b8ba16c..3480f29efee 100644
--- a/vendor/magento/module-admin-gws/Model/Controllers.php
+++ b/vendor/magento/module-admin-gws/Model/Controllers.php
@@ -922,6 +922,10 @@ class Controllers extends \Magento\AdminGws\Model\Observer\AbstractObserver impl
                     $this->_forward();
                     return false;
                 }
+                // Set current store to order/shipment store ID if the current store is not accessible by current user
+                if (!$this->_role->hasStoreAccess($this->_storeManager->getStore()->getId())) {
+                    $this->_storeManager->setCurrentStore($store);
+                }
             }
         }
         return true;
diff --git a/vendor/magento/module-admin-gws/etc/adminhtml/admingws.xml b/vendor/magento/module-admin-gws/etc/adminhtml/admingws.xml
index d14665c9bde..c15922f5e0a 100644
--- a/vendor/magento/module-admin-gws/etc/adminhtml/admingws.xml
+++ b/vendor/magento/module-admin-gws/etc/adminhtml/admingws.xml
@@ -148,10 +148,10 @@
         <callback class="adminhtml__sales_order_invoice__print" method="validateSalesOrderInvoiceViewAction" />
         <callback class="adminhtml__sales_order_invoice__" method="validateSalesOrderInvoiceCreateAction" />
         <callback class="sales__shipment__view" method="validateSalesOrderShipmentViewAction" />
-        <callback class="adminhtml__sales_order_shipment__addComment" method="validateSalesOrderShipmentViewAction" />
-        <callback class="adminhtml__sales_order_shipment__print" method="validateSalesOrderShipmentViewAction" />
-        <callback class="adminhtml__sales_order_shipment__" method="validateSalesOrderShipmentCreateAction" />
-        <callback class="adminhtml__sales_order_shipment__removeTrack" method="validateSalesOrderShipmentTrackAction" />
+        <callback class="adminhtml__order_shipment__addComment" method="validateSalesOrderShipmentViewAction" />
+        <callback class="adminhtml__order_shipment__print" method="validateSalesOrderShipmentViewAction" />
+        <callback class="adminhtml__order_shipment__" method="validateSalesOrderShipmentCreateAction" />
+        <callback class="adminhtml__order_shipment__removeTrack" method="validateSalesOrderShipmentTrackAction" />
         <callback class="adminhtml__checkout_agreement__edit" method="validateCheckoutAgreementEditAction" />
         <callback class="adminhtml__permissions_user__edit" method="validateAdminUserAction" />
         <callback class="adminhtml__permissions_user__save" method="validateAdminUserAction" />