diff --git a/netbox/netbox/context_processors.py b/netbox/netbox/context_processors.py
index 024ca85b5..ce4f8c45e 100644
--- a/netbox/netbox/context_processors.py
+++ b/netbox/netbox/context_processors.py
@@ -8,9 +8,11 @@ def settings_and_registry(request):
     """
     Expose Django settings and NetBox registry stores in the template context. Example: {{ settings.DEBUG }}
     """
+    user_preferences = request.user.config if request.user.is_authenticated else {}
     return {
         'settings': django_settings,
         'config': get_config(),
         'registry': registry,
-        'preferences': request.user.config if request.user.is_authenticated else {},
+        'preferences': user_preferences,
+        'htmx_navigation': user_preferences.get('ui.htmx_navigation', False) == 'true'
     }
diff --git a/netbox/templates/base/layout.html b/netbox/templates/base/layout.html
index 943ec9dbf..e154254b5 100644
--- a/netbox/templates/base/layout.html
+++ b/netbox/templates/base/layout.html
@@ -79,7 +79,7 @@ Blocks:
 
     {# Page content #}
     <div class="page-wrapper">
-      <div id="page-content" hx-boost="true" hx-target="#page-content" hx-select="#page-content" hx-swap="outerHTML show:window:top">
+      <div id="page-content"{% if htmx_navigation %} hx-boost="true" hx-target="#page-content" hx-select="#page-content" hx-swap="outerHTML show:window:top"{% endif %}>
 
       {# Page header #}
       {% block header %}
diff --git a/netbox/templates/dcim/component_list.html b/netbox/templates/dcim/component_list.html
index 089f161e7..3d261ea4d 100644
--- a/netbox/templates/dcim/component_list.html
+++ b/netbox/templates/dcim/component_list.html
@@ -10,7 +10,7 @@
     {% endif %}
     {% if 'bulk_rename' in actions %}
       {% with bulk_rename_view=model|validated_viewname:"bulk_rename" %}
-        <button type="submit" name="_rename" hx-post="{% url bulk_rename_view %}" hx-push-url="true" class="btn btn-outline-warning">
+        <button type="submit" name="_rename" {% formaction %}="{% url bulk_rename_view %}" hx-push-url="true" class="btn btn-outline-warning">
           <i class="mdi mdi-pencil-outline" aria-hidden="true"></i> {% trans "Rename Selected" %}
         </button>
       {% endwith %}
diff --git a/netbox/templates/dcim/device/components_base.html b/netbox/templates/dcim/device/components_base.html
index c6f68439b..47b0d7aab 100644
--- a/netbox/templates/dcim/device/components_base.html
+++ b/netbox/templates/dcim/device/components_base.html
@@ -5,8 +5,7 @@
     {% with bulk_edit_view=child_model|validated_viewname:"bulk_edit" %}
         {% if 'bulk_edit' in actions and bulk_edit_view %}
             <button type="submit" name="_edit"
-                    hx-post="{% url bulk_edit_view %}?device={{ object.pk }}&return_url={{ return_url }}"
-                    hx-push-url="true"
+                    {% formaction %}="{% url bulk_edit_view %}?device={{ object.pk }}&return_url={{ return_url }}"
                     class="btn btn-warning">
                 <i class="mdi mdi-pencil" aria-hidden="true"></i> Edit Selected
             </button>
@@ -15,8 +14,7 @@
     {% with bulk_rename_view=child_model|validated_viewname:"bulk_rename" %}
         {% if 'bulk_rename' in actions and bulk_rename_view %}
             <button type="submit" name="_rename"
-                    hx-post="{% url bulk_rename_view %}?return_url={{ return_url }}"
-                    hx-push-url="true"
+                    {% formaction %}="{% url bulk_rename_view %}?return_url={{ return_url }}"
                     class="btn btn-outline-warning">
                 <i class="mdi mdi-pencil-outline" aria-hidden="true"></i> Rename
             </button>
diff --git a/netbox/templates/dcim/device/consoleports.html b/netbox/templates/dcim/device/consoleports.html
index 41116fe84..d8de85868 100644
--- a/netbox/templates/dcim/device/consoleports.html
+++ b/netbox/templates/dcim/device/consoleports.html
@@ -7,8 +7,7 @@
     {% with bulk_disconnect_view=child_model|validated_viewname:"bulk_disconnect" %}
         {% if 'bulk_disconnect' in actions and bulk_disconnect_view %}
             <button type="submit" name="_disconnect"
-                    hx-post="{% url bulk_disconnect_view %}?return_url={{ return_url }}"
-                    hx-push-url="true"
+                    {% formaction %}="{% url bulk_disconnect_view %}?return_url={{ return_url }}"
                     class="btn btn-outline-danger">
                 <span class="mdi mdi-ethernet-cable-off" aria-hidden="true"></span> {% trans "Disconnect" %}
             </button>
diff --git a/netbox/templates/dcim/device/consoleserverports.html b/netbox/templates/dcim/device/consoleserverports.html
index 0284f950d..29efdb65b 100644
--- a/netbox/templates/dcim/device/consoleserverports.html
+++ b/netbox/templates/dcim/device/consoleserverports.html
@@ -7,8 +7,7 @@
     {% with bulk_disconnect_view=child_model|validated_viewname:"bulk_disconnect" %}
         {% if 'bulk_disconnect' in actions and bulk_disconnect_view %}
             <button type="submit" name="_disconnect"
-                    hx-post="{% url bulk_disconnect_view %}?return_url={{ return_url }}"
-                    hx-push-url="true"
+                    {% formaction %}="{% url bulk_disconnect_view %}?return_url={{ return_url }}"
                     class="btn btn-outline-danger">
                 <span class="mdi mdi-ethernet-cable-off" aria-hidden="true"></span> {% trans "Disconnect" %}
             </button>
diff --git a/netbox/templates/dcim/device/frontports.html b/netbox/templates/dcim/device/frontports.html
index 1132aea5e..4d7f14769 100644
--- a/netbox/templates/dcim/device/frontports.html
+++ b/netbox/templates/dcim/device/frontports.html
@@ -7,8 +7,7 @@
     {% with bulk_disconnect_view=child_model|validated_viewname:"bulk_disconnect" %}
         {% if 'bulk_disconnect' in actions and bulk_disconnect_view %}
             <button type="submit" name="_disconnect"
-                    hx-post="{% url bulk_disconnect_view %}?return_url={{ return_url }}"
-                    hx-push-url="true"
+                    {% formaction %}="{% url bulk_disconnect_view %}?return_url={{ return_url }}"
                     class="btn btn-outline-danger">
                 <span class="mdi mdi-ethernet-cable-off" aria-hidden="true"></span> {% trans "Disconnect" %}
             </button>
diff --git a/netbox/templates/dcim/device/interfaces.html b/netbox/templates/dcim/device/interfaces.html
index 5c47d944d..8d46d77ea 100644
--- a/netbox/templates/dcim/device/interfaces.html
+++ b/netbox/templates/dcim/device/interfaces.html
@@ -11,8 +11,7 @@
     {% with bulk_disconnect_view=child_model|validated_viewname:"bulk_disconnect" %}
         {% if 'bulk_disconnect' in actions and bulk_disconnect_view %}
             <button type="submit" name="_disconnect"
-                    hx-post="{% url bulk_disconnect_view %}?return_url={{ return_url }}"
-                    hx-push-url="true"
+                    {% formaction %}="{% url bulk_disconnect_view %}?return_url={{ return_url }}"
                     class="btn btn-outline-danger">
                 <span class="mdi mdi-ethernet-cable-off" aria-hidden="true"></span> {% trans "Disconnect" %}
             </button>
diff --git a/netbox/templates/dcim/device/poweroutlets.html b/netbox/templates/dcim/device/poweroutlets.html
index 5a9758964..66c765181 100644
--- a/netbox/templates/dcim/device/poweroutlets.html
+++ b/netbox/templates/dcim/device/poweroutlets.html
@@ -7,8 +7,7 @@
     {% with bulk_disconnect_view=child_model|validated_viewname:"bulk_disconnect" %}
         {% if 'bulk_disconnect' in actions and bulk_disconnect_view %}
             <button type="submit" name="_disconnect"
-                    hx-post="{% url bulk_disconnect_view %}?return_url={{ return_url }}"
-                    hx-push-url="true"
+                    {% formaction %}="{% url bulk_disconnect_view %}?return_url={{ return_url }}"
                     class="btn btn-outline-danger">
                 <span class="mdi mdi-ethernet-cable-off" aria-hidden="true"></span> {% trans "Disconnect" %}
             </button>
diff --git a/netbox/templates/dcim/device/powerports.html b/netbox/templates/dcim/device/powerports.html
index 669222b37..a299130a4 100644
--- a/netbox/templates/dcim/device/powerports.html
+++ b/netbox/templates/dcim/device/powerports.html
@@ -7,8 +7,7 @@
     {% with bulk_disconnect_view=child_model|validated_viewname:"bulk_disconnect" %}
         {% if 'bulk_disconnect' in actions and bulk_disconnect_view %}
             <button type="submit" name="_disconnect"
-                    hx-post="{% url bulk_disconnect_view %}?return_url={{ return_url }}"
-                    hx-push-url="true"
+                    {% formaction %}="{% url bulk_disconnect_view %}?return_url={{ return_url }}"
                     class="btn btn-outline-danger">
                 <span class="mdi mdi-ethernet-cable-off" aria-hidden="true"></span> {% trans "Disconnect" %}
             </button>
diff --git a/netbox/templates/dcim/device/rearports.html b/netbox/templates/dcim/device/rearports.html
index 8cf99ccd0..184e80d99 100644
--- a/netbox/templates/dcim/device/rearports.html
+++ b/netbox/templates/dcim/device/rearports.html
@@ -7,8 +7,7 @@
     {% with bulk_disconnect_view=child_model|validated_viewname:"bulk_disconnect" %}
         {% if 'bulk_disconnect' in actions and bulk_disconnect_view %}
             <button type="submit" name="_disconnect"
-                    hx-post="{% url bulk_disconnect_view %}?return_url={{ return_url }}"
-                    hx-push-url="true"
+                    {% formaction %}="{% url bulk_disconnect_view %}?return_url={{ return_url }}"
                     class="btn btn-outline-danger">
                 <span class="mdi mdi-ethernet-cable-off" aria-hidden="true"></span> {% trans "Disconnect" %}
             </button>
diff --git a/netbox/templates/dcim/device_list.html b/netbox/templates/dcim/device_list.html
index e8bf7b5a0..41ef8fc73 100644
--- a/netbox/templates/dcim/device_list.html
+++ b/netbox/templates/dcim/device_list.html
@@ -11,63 +11,63 @@
       <ul class="dropdown-menu">
         {% if perms.dcim.add_consoleport %}
           <li>
-            <button type="submit" hx-post="{% url 'dcim:device_bulk_add_consoleport' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" hx-push-url="true" class="dropdown-item">
+            <button type="submit" {% formaction %}="{% url 'dcim:device_bulk_add_consoleport' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="dropdown-item">
              {% trans "Console Ports" %}
             </button>
           </li>
         {% endif %}
         {% if perms.dcim.add_consoleserverport %}
           <li>
-            <button type="submit" hx-post="{% url 'dcim:device_bulk_add_consoleserverport' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" hx-push-url="true" class="dropdown-item ">
+            <button type="submit" {% formaction %}="{% url 'dcim:device_bulk_add_consoleserverport' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="dropdown-item ">
               {% trans "Console Server Ports" %}
             </button>
           </li>
         {% endif %}
         {% if perms.dcim.add_powerport %}
           <li>
-            <button type="submit" hx-post="{% url 'dcim:device_bulk_add_powerport' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" hx-push-url="true" class="dropdown-item">
+            <button type="submit" {% formaction %}="{% url 'dcim:device_bulk_add_powerport' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="dropdown-item">
               {% trans "Power Ports" %}
             </button>
           </li>
         {% endif %}
         {% if perms.dcim.add_poweroutlet %}
           <li>
-            <button type="submit" hx-post="{% url 'dcim:device_bulk_add_poweroutlet' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" hx-push-url="true" class="dropdown-item">
+            <button type="submit" {% formaction %}="{% url 'dcim:device_bulk_add_poweroutlet' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="dropdown-item">
               {% trans "Power Outlets" %}
             </button>
           </li>
         {% endif %}
         {% if perms.dcim.add_interface %}
           <li>
-              <button type="submit" hx-post="{% url 'dcim:device_bulk_add_interface' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" hx-push-url="true" class="dropdown-item">
+              <button type="submit" {% formaction %}="{% url 'dcim:device_bulk_add_interface' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="dropdown-item">
                 {% trans "Interfaces" %}
               </button>
           </li>
         {% endif %}
         {% if perms.dcim.add_rearport %}
           <li>
-            <button type="submit" hx-post="{% url 'dcim:device_bulk_add_rearport' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" hx-push-url="true" class="dropdown-item">
+            <button type="submit" {% formaction %}="{% url 'dcim:device_bulk_add_rearport' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="dropdown-item">
               {% trans "Rear Ports" %}
             </button>
           </li>
         {% endif %}
         {% if perms.dcim.add_devicebay %}
           <li>
-            <button type="submit" hx-post="{% url 'dcim:device_bulk_add_devicebay' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" hx-push-url="true" class="dropdown-item">
+            <button type="submit" {% formaction %}="{% url 'dcim:device_bulk_add_devicebay' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="dropdown-item">
               {% trans "Device Bays" %}
             </button>
           </li>
         {% endif %}
         {% if perms.dcim.add_modulebay %}
           <li>
-            <button type="submit" hx-post="{% url 'dcim:device_bulk_add_modulebay' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" hx-push-url="true" class="dropdown-item">
+            <button type="submit" {% formaction %}="{% url 'dcim:device_bulk_add_modulebay' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="dropdown-item">
               {% trans "Module Bays" %}
             </button>
           </li>
         {% endif %}
         {% if perms.dcim.add_inventoryitem %}
           <li>
-            <button type="submit" hx-post="{% url 'dcim:device_bulk_add_inventoryitem' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" hx-push-url="true" class="dropdown-item">
+            <button type="submit" {% formaction %}="{% url 'dcim:device_bulk_add_inventoryitem' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="dropdown-item">
               {% trans "Inventory Items" %}
             </button>
           </li>
@@ -78,7 +78,7 @@
   {% if 'bulk_edit' in actions %}
     <div class="btn-group" role="group">
       {% bulk_edit_button model query_params=request.GET %}
-      <button type="submit" name="_rename" hx-post="{% url 'dcim:device_bulk_rename' %}?return_url={% url 'dcim:device_list' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" hx-push-url="true" class="btn btn-outline-warning">
+      <button type="submit" name="_rename" {% formaction %}="{% url 'dcim:device_bulk_rename' %}?return_url={% url 'dcim:device_list' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="btn btn-outline-warning">
         <i class="mdi mdi-pencil-outline" aria-hidden="true"></i> {% trans "Rename" %}
       </button>
     </div>
diff --git a/netbox/templates/dcim/devicetype/component_templates.html b/netbox/templates/dcim/devicetype/component_templates.html
index 63c977c93..df9789c00 100644
--- a/netbox/templates/dcim/devicetype/component_templates.html
+++ b/netbox/templates/dcim/devicetype/component_templates.html
@@ -7,8 +7,7 @@
     {% with bulk_edit_view=child_model|validated_viewname:"bulk_edit" %}
         {% if 'bulk_edit' in actions and bulk_edit_view %}
             <button type="submit" name="_edit"
-                    hx-post="{% url bulk_edit_view %}?device={{ object.pk }}&return_url={{ return_url }}"
-                    hx-push-url="true"
+                    {% formaction %}="{% url bulk_edit_view %}?device={{ object.pk }}&return_url={{ return_url }}"
                     class="btn btn-warning">
                 <i class="mdi mdi-pencil" aria-hidden="true"></i> Edit Selected
             </button>
@@ -17,8 +16,7 @@
     {% with bulk_rename_view=child_model|validated_viewname:"bulk_rename" %}
         {% if 'bulk_rename' in actions and bulk_rename_view %}
             <button type="submit" name="_rename"
-                    hx-post="{% url bulk_rename_view %}?return_url={{ return_url }}"
-                    hx-push-url="true"
+                    {% formaction %}="{% url bulk_rename_view %}?return_url={{ return_url }}"
                     class="btn btn-outline-warning">
                 <i class="mdi mdi-pencil-outline" aria-hidden="true"></i> Rename
             </button>
diff --git a/netbox/templates/dcim/moduletype/component_templates.html b/netbox/templates/dcim/moduletype/component_templates.html
index cf49dd00d..d67c6e8fb 100644
--- a/netbox/templates/dcim/moduletype/component_templates.html
+++ b/netbox/templates/dcim/moduletype/component_templates.html
@@ -13,13 +13,13 @@
             </div>
             <div class="card-footer d-print-none">
                 {% if table.rows %}
-                    <button type="submit" name="_edit" hx-post="{% url table.Meta.model|viewname:"bulk_rename" %}?return_url={{ return_url }}"  hx-push-url="true"class="btn btn-warning">
+                    <button type="submit" name="_edit" {% formaction %}="{% url table.Meta.model|viewname:"bulk_rename" %}?return_url={{ return_url }}" class="btn btn-warning">
                         <span class="mdi mdi-pencil-outline" aria-hidden="true"></span> {% trans "Rename" %}
                     </button>
-                    <button type="submit" name="_edit" hx-post="{% url table.Meta.model|viewname:"bulk_edit" %}?return_url={{ return_url }}" hx-push-url="true" class="btn btn-warning">
+                    <button type="submit" name="_edit" {% formaction %}="{% url table.Meta.model|viewname:"bulk_edit" %}?return_url={{ return_url }}" class="btn btn-warning">
                         <span class="mdi mdi-pencil" aria-hidden="true"></span> {% trans "Edit" %}
                     </button>
-                    <button type="submit" name="_delete" hx-post="{% url table.Meta.model|viewname:"bulk_delete" %}?return_url={{ return_url }}" hx-push-url="true" class="btn btn-danger">
+                    <button type="submit" name="_delete" {% formaction %}="{% url table.Meta.model|viewname:"bulk_delete" %}?return_url={{ return_url }}" class="btn btn-danger">
                         <i class="mdi mdi-trash-can-outline" aria-hidden="true"></i> {% trans "Delete" %}
                     </button>
                 {% endif %}
diff --git a/netbox/templates/dcim/powerpanel.html b/netbox/templates/dcim/powerpanel.html
index d73e251af..8866994fe 100644
--- a/netbox/templates/dcim/powerpanel.html
+++ b/netbox/templates/dcim/powerpanel.html
@@ -52,17 +52,17 @@
         {% htmx_table 'dcim:powerfeed_list' power_panel_id=object.pk %}
         <div class="card-footer d-print-none">
           {% if perms.dcim.change_powerfeed %}
-            <button type="submit" name="_edit" hx-post="{% url 'dcim:powerfeed_bulk_edit' %}?return_url={% url 'dcim:powerpanel' pk=object.pk %}" hx-push-url="true" class="btn btn-warning">
+            <button type="submit" name="_edit" {% formaction %}="{% url 'dcim:powerfeed_bulk_edit' %}?return_url={% url 'dcim:powerpanel' pk=object.pk %}" class="btn btn-warning">
               <span class="mdi mdi-pencil" aria-hidden="true"></span> {% trans "Edit" %}
             </button>
           {% endif %}
           {% if perms.dcim.delete_cable %}
-            <button type="submit" name="_disconnect" hx-post="{% url 'dcim:powerfeed_bulk_disconnect' %}?return_url={% url 'dcim:powerpanel' pk=object.pk %}" hx-push-url="true" class="btn btn-outline-danger">
+            <button type="submit" name="_disconnect" {% formaction %}="{% url 'dcim:powerfeed_bulk_disconnect' %}?return_url={% url 'dcim:powerpanel' pk=object.pk %}" class="btn btn-outline-danger">
               <span class="mdi mdi-ethernet-cable-off" aria-hidden="true"></span> {% trans "Disconnect" %}
             </button>
           {% endif %}
           {% if perms.dcim.delete_powerfeed %}
-            <button type="submit" name="_delete" hx-post="{% url 'dcim:powerfeed_bulk_delete' %}?return_url={% url 'dcim:powerpanel' pk=object.pk %}" hx-push-url="true" class="btn btn-danger">
+            <button type="submit" name="_delete" {% formaction %}="{% url 'dcim:powerfeed_bulk_delete' %}?return_url={% url 'dcim:powerpanel' pk=object.pk %}" class="btn btn-danger">
               <span class="mdi mdi-trash-can-outline" aria-hidden="true"></span> {% trans "Delete" %}
             </button>
           {% endif %}
diff --git a/netbox/templates/extras/configcontext_list.html b/netbox/templates/extras/configcontext_list.html
index 1d1716888..648323532 100644
--- a/netbox/templates/extras/configcontext_list.html
+++ b/netbox/templates/extras/configcontext_list.html
@@ -3,7 +3,7 @@
 
 {% block bulk_buttons %}
   {% if perms.extras.sync_configcontext %}
-    <button type="submit" name="_sync" hx-post="{% url 'extras:configcontext_bulk_sync' %}" hx-push-url="true" class="btn btn-primary">
+    <button type="submit" name="_sync" {% formaction %}="{% url 'extras:configcontext_bulk_sync' %}" class="btn btn-primary">
       <i class="mdi mdi-sync" aria-hidden="true"></i> {% trans "Sync Data" %}
     </button>
   {% endif %}
diff --git a/netbox/templates/extras/configtemplate_list.html b/netbox/templates/extras/configtemplate_list.html
index ddf1ad23a..c9db67e36 100644
--- a/netbox/templates/extras/configtemplate_list.html
+++ b/netbox/templates/extras/configtemplate_list.html
@@ -3,7 +3,7 @@
 
 {% block bulk_buttons %}
   {% if perms.extras.sync_configtemplate %}
-    <button type="submit" name="_sync" hx-post="{% url 'extras:configtemplate_bulk_sync' %}" hx-push-url="true" class="btn btn-primary">
+    <button type="submit" name="_sync" {% formaction %}="{% url 'extras:configtemplate_bulk_sync' %}" class="btn btn-primary">
       <i class="mdi mdi-sync" aria-hidden="true"></i> {% trans "Sync Data" %}
     </button>
   {% endif %}
diff --git a/netbox/templates/extras/exporttemplate_list.html b/netbox/templates/extras/exporttemplate_list.html
index af02e21de..4284336a5 100644
--- a/netbox/templates/extras/exporttemplate_list.html
+++ b/netbox/templates/extras/exporttemplate_list.html
@@ -3,7 +3,7 @@
 
 {% block bulk_buttons %}
   {% if perms.extras.sync_configcontext %}
-    <button type="submit" name="_sync" hx-post="{% url 'extras:exporttemplate_bulk_sync' %}" hx-push-url="true" class="btn btn-primary">
+    <button type="submit" name="_sync" {% formaction %}="{% url 'extras:exporttemplate_bulk_sync' %}" class="btn btn-primary">
       <i class="mdi mdi-sync" aria-hidden="true"></i> {% trans "Sync Data" %}
     </button>
   {% endif %}
diff --git a/netbox/templates/generic/object_children.html b/netbox/templates/generic/object_children.html
index 2b58ce77d..599096ec1 100644
--- a/netbox/templates/generic/object_children.html
+++ b/netbox/templates/generic/object_children.html
@@ -21,8 +21,7 @@
                         {% with bulk_edit_view=child_model|validated_viewname:"bulk_edit" %}
                             {% if 'bulk_edit' in actions and bulk_edit_view %}
                                 <button type="submit" name="_edit"
-                                        hx-post="{% url bulk_edit_view %}?return_url={{ return_url }}"
-                                        hx-push-url="true"
+                                        {% formaction %}="{% url bulk_edit_view %}?return_url={{ return_url }}"
                                         class="btn btn-warning">
                                     <i class="mdi mdi-pencil" aria-hidden="true"></i> {% trans "Edit Selected" %}
                                 </button>
@@ -36,8 +35,7 @@
                         {% with bulk_delete_view=child_model|validated_viewname:"bulk_delete" %}
                             {% if 'bulk_delete' in actions and bulk_delete_view %}
                                 <button type="submit"
-                                        hx-post="{% url bulk_delete_view %}?return_url={{ return_url }}"
-                                        hx-push-url="true"
+                                        {% formaction %}="{% url bulk_delete_view %}?return_url={{ return_url }}"
                                         class="btn btn-danger">
                                     <i class="mdi mdi-trash-can-outline" aria-hidden="true"></i> {% trans "Delete Selected" %}
                                 </button>
diff --git a/netbox/templates/virtualization/cluster/devices.html b/netbox/templates/virtualization/cluster/devices.html
index 1edbac0a7..a71fab8b5 100644
--- a/netbox/templates/virtualization/cluster/devices.html
+++ b/netbox/templates/virtualization/cluster/devices.html
@@ -5,8 +5,7 @@
     {{ block.super }}
     {% if 'bulk_remove_devices' in actions %}
         <button type="submit" name="_remove"
-                hx-post="{% url 'virtualization:cluster_remove_devices' pk=object.pk %}?return_url={{ return_url }}"
-                hx-push-url="true"
+                {% formaction %}="{% url 'virtualization:cluster_remove_devices' pk=object.pk %}?return_url={{ return_url }}"
                 class="btn btn-danger">
             <span class="mdi mdi-trash-can-outline" aria-hidden="true"></span> {% trans "Remove Selected" %}
         </button>
diff --git a/netbox/templates/virtualization/virtualmachine/interfaces.html b/netbox/templates/virtualization/virtualmachine/interfaces.html
index da454a709..f74bd9770 100644
--- a/netbox/templates/virtualization/virtualmachine/interfaces.html
+++ b/netbox/templates/virtualization/virtualmachine/interfaces.html
@@ -6,8 +6,7 @@
     {{ block.super }}
     {% if 'bulk_rename' in actions %}
         <button type="submit" name="_rename"
-                hx-post="{% url 'virtualization:vminterface_bulk_rename' %}?return_url={{ return_url }}"
-                hx-push-url="true"
+                {% formaction %}="{% url 'virtualization:vminterface_bulk_rename' %}?return_url={{ return_url }}"
                 class="btn btn-outline-warning">
             <i class="mdi mdi-pencil-outline" aria-hidden="true"></i> {% trans "Rename" %}
         </button>
diff --git a/netbox/templates/virtualization/virtualmachine/virtual_disks.html b/netbox/templates/virtualization/virtualmachine/virtual_disks.html
index f6a2a9a9c..2637d851a 100644
--- a/netbox/templates/virtualization/virtualmachine/virtual_disks.html
+++ b/netbox/templates/virtualization/virtualmachine/virtual_disks.html
@@ -6,8 +6,7 @@
     {{ block.super }}
     {% if 'bulk_rename' in actions %}
         <button type="submit" name="_rename"
-                hx-post="{% url 'virtualization:virtualdisk_bulk_rename' %}?return_url={{ return_url }}"
-                hx-push-url="true"
+                {% formaction %}="{% url 'virtualization:virtualdisk_bulk_rename' %}?return_url={{ return_url }}"
                 class="btn btn-outline-warning">
             <i class="mdi mdi-pencil-outline" aria-hidden="true"></i> {% trans "Rename" %}
         </button>
diff --git a/netbox/templates/virtualization/virtualmachine_list.html b/netbox/templates/virtualization/virtualmachine_list.html
index ec562406e..63fbdc2b7 100644
--- a/netbox/templates/virtualization/virtualmachine_list.html
+++ b/netbox/templates/virtualization/virtualmachine_list.html
@@ -10,14 +10,14 @@
       <ul class="dropdown-menu">
         {% if perms.virtualization.add_vminterface %}
           <li>
-            <button type="submit" hx-post="{% url 'virtualization:virtualmachine_bulk_add_vminterface' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" hx-push-url="true" class="dropdown-item">
+            <button type="submit" {% formaction %}="{% url 'virtualization:virtualmachine_bulk_add_vminterface' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="dropdown-item">
               {% trans "Interfaces" %}
             </button>
           </li>
         {% endif %}
         {% if perms.virtualization.add_virtualdisk %}
           <li>
-            <button type="submit" hx-post="{% url 'virtualization:virtualmachine_bulk_add_virtualdisk' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" hx-push-url="true" class="dropdown-item">
+            <button type="submit" {% formaction %}="{% url 'virtualization:virtualmachine_bulk_add_virtualdisk' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="dropdown-item">
               {% trans "Virtual Disks" %}
             </button>
           </li>
diff --git a/netbox/utilities/templates/buttons/bulk_delete.html b/netbox/utilities/templates/buttons/bulk_delete.html
index 5a838c68c..a4860ce2d 100644
--- a/netbox/utilities/templates/buttons/bulk_delete.html
+++ b/netbox/utilities/templates/buttons/bulk_delete.html
@@ -1,6 +1,6 @@
 {% load i18n %}
 {% if url %}
-  <button type="submit" name="_delete" hx-post="{{ url }}" hx-push-url="true" class="btn btn-red">
+  <button type="submit" name="_delete" {% formaction %}="{{ url }}" class="btn btn-red">
     <i class="mdi mdi-trash-can-outline" aria-hidden="true"></i> {% trans "Delete Selected" %}
   </button>
 {% endif %}
diff --git a/netbox/utilities/templates/buttons/bulk_edit.html b/netbox/utilities/templates/buttons/bulk_edit.html
index 99623f61b..a5aa03112 100644
--- a/netbox/utilities/templates/buttons/bulk_edit.html
+++ b/netbox/utilities/templates/buttons/bulk_edit.html
@@ -1,6 +1,6 @@
 {% load i18n %}
 {% if url %}
-  <button type="submit" name="_edit" hx-post="{{ url }}" hx-push-url="true" class="btn btn-yellow">
+  <button type="submit" name="_edit" {% formaction %}="{{ url }}" class="btn btn-yellow">
     <i class="mdi mdi-pencil" aria-hidden="true"></i> {% trans "Edit Selected" %}
   </button>
 {% endif %}
diff --git a/netbox/utilities/templates/navigation/menu.html b/netbox/utilities/templates/navigation/menu.html
index 362cb5e51..f32e3d678 100644
--- a/netbox/utilities/templates/navigation/menu.html
+++ b/netbox/utilities/templates/navigation/menu.html
@@ -1,6 +1,6 @@
 {% load helpers %}
 
-<ul class="navbar-nav pt-lg-2" hx-boost="true" hx-target="#page-content" hx-select="#page-content" hx-swap="outerHTML show:window:top">
+<ul class="navbar-nav pt-lg-2"{% if htmx_navigation %} hx-boost="true" hx-target="#page-content" hx-select="#page-content" hx-swap="outerHTML show:window:top"{% endif %}>
   {% for menu, groups in nav_items %}
     <li class="nav-item dropdown">
 
diff --git a/netbox/utilities/templatetags/builtins/tags.py b/netbox/utilities/templatetags/builtins/tags.py
index dc5d75f48..03f2c83ba 100644
--- a/netbox/utilities/templatetags/builtins/tags.py
+++ b/netbox/utilities/templatetags/builtins/tags.py
@@ -9,6 +9,7 @@ __all__ = (
     'checkmark',
     'copy_content',
     'customfield_value',
+    'formaction',
     'tag',
 )
 
@@ -114,3 +115,14 @@ def htmx_table(context, viewname, return_url=None, **kwargs):
         'viewname': viewname,
         'url_params': url_params,
     }
+
+
+@register.simple_tag(takes_context=True)
+def formaction(context):
+    """
+    Replace the 'formaction' attribute on an HTML element with the appropriate HTMX attributes
+    if HTMX navigation is enabled (per the user's preferences).
+    """
+    if context.get('htmx_navigation', False):
+        return 'hx-push-url="true" hx-post'
+    return 'formaction'