diff --git a/netbox/templates/extras/configcontext.html b/netbox/templates/extras/configcontext.html
index 72908f15e..f1d735cfd 100644
--- a/netbox/templates/extras/configcontext.html
+++ b/netbox/templates/extras/configcontext.html
@@ -82,10 +82,10 @@
     </div>
     <div class="col col-md-7">
       <div class="card">
-        <div class="card-header">
-          <h5>{% trans "Data" %}</h5>
+        <h5 class="card-header d-flex justify-content-between">
+          {% trans "Data" %}
           {% include 'extras/inc/configcontext_format.html' %}
-        </div>
+        </h5>
         <div class="card-body">
           {% include 'inc/sync_warning.html' %}
           {% include 'extras/inc/configcontext_data.html' with data=object.data format=format %}
diff --git a/netbox/templates/extras/inc/configcontext_format.html b/netbox/templates/extras/inc/configcontext_format.html
index 4df75d65b..967413879 100644
--- a/netbox/templates/extras/inc/configcontext_format.html
+++ b/netbox/templates/extras/inc/configcontext_format.html
@@ -1,4 +1,4 @@
-<div class="float-end">
+<div>
     <div class="btn-group btn-group-sm" role="group">
         <a href="?format=json" type="button" class="btn btn-outline-dark{% if format == 'json' %} active{% endif %}">JSON</a>
         <a href="?format=yaml" type="button" class="btn btn-outline-dark{% if format == 'yaml' %} active{% endif %}">YAML</a>
diff --git a/netbox/templates/extras/object_configcontext.html b/netbox/templates/extras/object_configcontext.html
index 2c9484452..e43973e41 100644
--- a/netbox/templates/extras/object_configcontext.html
+++ b/netbox/templates/extras/object_configcontext.html
@@ -7,7 +7,7 @@
     <div class="row">
         <div class="col col-md-6">
             <div class="card">
-                <h5 class="card-header">
+                <h5 class="card-header d-flex justify-content-between">
                     {% trans "Rendered Context" %}
                     {% include 'extras/inc/configcontext_format.html' %}
                 </h5>