diff --git a/src/etc/adminhtml/events.xml b/src/etc/adminhtml/events.xml
new file mode 100644
index 0000000..3bfe994
--- /dev/null
+++ b/src/etc/adminhtml/events.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
+    <event name="controller_action_predispatch_adminhtml_order_shipment_new">
+        <!-- Prevent redirecting to source selection page when making a shipment via the MAP -->
+        <observer name="inventory_shipping_check_data_before_load_new_shipment" disabled="true"/>
+    </event>
+</config>
diff --git a/src/view/adminhtml/layout/sales_order_view.xml b/src/view/adminhtml/layout/sales_order_view.xml
new file mode 100644
index 0000000..e3a7915
--- /dev/null
+++ b/src/view/adminhtml/layout/sales_order_view.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <body>
+        <referenceContainer name="content">
+            <!--
+            Remove this block "Magento\InventoryShippingAdminUi\Block\Adminhtml\Order\View\ShipButton" which takes you
+            to a source selection screen if the order is deemed to need it via sales->order->ship
+
+            The source has already been removed at the time of order shipment, so just take the admin to the old shipment
+            page (which is the same functionality if manageStock was set to 0)
+            -->
+            <referenceBlock name="sales_order_view_ship_button" remove="true"/>
+        </referenceContainer>
+    </body>
+</page>
