diff --git a/djangocms_versioning/admin.py b/djangocms_versioning/admin.py
index bc73d4dc..834a247d 100644
--- a/djangocms_versioning/admin.py
+++ b/djangocms_versioning/admin.py
@@ -972,7 +972,6 @@ def publish_view(self, request, object_id):
 
         # Redirect to published?
         if conf.ON_PUBLISH_REDIRECT == "published":
-            redirect_url = None
             if hasattr(version.content, "get_absolute_url"):
                 redirect_url = version.content.get_absolute_url() or redirect_url
 
diff --git a/djangocms_versioning/cms_toolbars.py b/djangocms_versioning/cms_toolbars.py
index c9d3838a..153f43ba 100644
--- a/djangocms_versioning/cms_toolbars.py
+++ b/djangocms_versioning/cms_toolbars.py
@@ -125,8 +125,8 @@ def _add_unlock_button(self):
         if LOCK_VERSIONS and self._is_versioned():
             item = ButtonList(side=self.toolbar.RIGHT)
             proxy_model = self._get_proxy_model()
-            version = Version.objects.get_for_content(self.toolbar.obj)
-            if version.check_unlock.as_bool(self.request.user):
+            version = Version.objects.filter_by_content_grouping_values(self.toolbar.obj).filter(state=DRAFT).first()
+            if version and version.check_unlock.as_bool(self.request.user):
                 unlock_url = reverse(
                     f"admin:{proxy_model._meta.app_label}_{proxy_model.__name__.lower()}_unlock",
                     args=(version.pk,),
diff --git a/djangocms_versioning/static/djangocms_versioning/css/versioning.css b/djangocms_versioning/static/djangocms_versioning/css/versioning.css
index f66b94a0..bc19b68b 100644
--- a/djangocms_versioning/static/djangocms_versioning/css/versioning.css
+++ b/djangocms_versioning/static/djangocms_versioning/css/versioning.css
@@ -207,6 +207,3 @@ ins.cms-diff img {
 .cms-select::-ms-expand {
     opacity: 0;
 }
-input.button.revert-button {
-    margin: 5px;
-}
diff --git a/djangocms_versioning/static/djangocms_versioning/js/admin/versioning-actions.js b/djangocms_versioning/static/djangocms_versioning/js/admin/versioning-actions.js
new file mode 100644
index 00000000..50edfa4c
--- /dev/null
+++ b/djangocms_versioning/static/djangocms_versioning/js/admin/versioning-actions.js
@@ -0,0 +1,21 @@
+(function () {
+    "use strict";
+
+    function closeSideFrame() {
+        try {
+            window.top.CMS.API.Sideframe.close();
+        } catch (err) {}
+    }
+
+    document.addEventListener('DOMContentLoaded', function () {
+        document.querySelectorAll('form.js-close-sideframe').forEach(el => {
+            el.addEventListener("submit", (ev) => {
+                ev.preventDefault();
+                closeSideFrame();
+                const form = window.top.document.body.appendChild(ev.target);
+                form.style.display = 'none';
+                form.submit();
+            });
+        });
+    });
+})();
diff --git a/djangocms_versioning/templates/djangocms_versioning/admin/archive_confirmation.html b/djangocms_versioning/templates/djangocms_versioning/admin/archive_confirmation.html
index 40ab5cd3..4a70749c 100644
--- a/djangocms_versioning/templates/djangocms_versioning/admin/archive_confirmation.html
+++ b/djangocms_versioning/templates/djangocms_versioning/admin/archive_confirmation.html
@@ -6,6 +6,7 @@
     {{ block.super }}
     {{ media }}
     <script type="text/javascript" src="{% static 'admin/js/cancel.js' %}"></script>
+    <script type="text/javascript" src="{% static 'djangocms_versioning/js/admin/versioning-actions.js' %}"></script>
 {% endblock %}
 
 {% block breadcrumbs %}{% endblock %}
@@ -15,15 +16,17 @@
 <p>{% translate "Are you sure you want to archive the following version?" %}</p>
 <h3>{{ object_name }}</h3>
 <h4>{% blocktrans %} Version number: {{ version_number }}{% endblocktrans %}</h4>
-<form action="" method="POST">
+<form action="" method="POST" class="js-close-sideframe">
     {% csrf_token %}
-    <input  class="button confirm-link js-versioning-keep-sideframe"
-            type="submit"
-            value="{% translate "Yes, I'm sure" %}">
-    <a href="{{ back_url }}">
-        <input type="button"
-               class="button js-versioning-keep-sideframe"
-               value="{% translate 'No, take me back' %}">
-    </a>
+    <div class="submit-row">
+        <input  class="button confirm-link"
+                type="submit"
+                value="{% translate "Yes, I'm sure" %}">
+        <a href="{{ back_url }}">
+            <input type="button"
+                   class="button js-versioning-keep-sideframe"
+                   value="{% translate 'No, take me back' %}">
+        </a>
+    </div>
 </form>
 {% endblock %}
diff --git a/djangocms_versioning/templates/djangocms_versioning/admin/revert_confirmation.html b/djangocms_versioning/templates/djangocms_versioning/admin/revert_confirmation.html
index 3de7d687..7bbbb168 100644
--- a/djangocms_versioning/templates/djangocms_versioning/admin/revert_confirmation.html
+++ b/djangocms_versioning/templates/djangocms_versioning/admin/revert_confirmation.html
@@ -6,6 +6,7 @@
     {{ media }}
     <link rel="stylesheet" href="{% static 'djangocms_versioning/css/versioning.css' %}">
     <script type="text/javascript" src="{% static 'admin/js/cancel.js' %}"></script>
+    <script type="text/javascript" src="{% static 'djangocms_versioning/js/admin/versioning-actions.js' %}"></script>
 {% endblock %}
 
 {% block breadcrumbs %}{% endblock %}
@@ -22,20 +23,20 @@ <h1>{% block title %}{% translate "Revert Confirmation" %}{% endblock %}</h1>
 </p>
 <h3>{{ object_name }}</h3>
 <h4>{% blocktrans %}Version number: {{ version_number }}{% endblocktrans %}</h4>
-<form action="" method="POST">
+<form action="" method="POST" class="js-close-sideframe">
     {% csrf_token %}
     <div class="submit-row">
         {% if draft_version %}
-        <input  class="button revert-button confirm-link js-versioning-keep-sideframe"
+        <input  class="button revert-button confirm-link"
                 type="submit"
                 name="discard"
                 value="{% translate 'Discard existing draft and Revert' %}">
-        <input  class="button revert-button confirm-link js-versioning-keep-sideframe"
+        <input  class="button revert-button confirm-link"
                 name="archive"
                 type="submit"
                 value="{% translate 'Archive existing draft and Revert' %}">
         {% else %}
-        <input  class="button revert-button confirm-link js-versioning-keep-sideframe"
+        <input  class="button revert-button confirm-link"
                 type="submit"
                 name="revert"
                 value="{% translate "Yes, I'm sure" %}">
diff --git a/djangocms_versioning/templates/djangocms_versioning/admin/unpublish_confirmation.html b/djangocms_versioning/templates/djangocms_versioning/admin/unpublish_confirmation.html
index 7a87ab53..047dd547 100644
--- a/djangocms_versioning/templates/djangocms_versioning/admin/unpublish_confirmation.html
+++ b/djangocms_versioning/templates/djangocms_versioning/admin/unpublish_confirmation.html
@@ -5,6 +5,7 @@
     {{ block.super }}
     {{ media }}
     <script type="text/javascript" src="{% static 'admin/js/cancel.js' %}"></script>
+    <script type="text/javascript" src="{% static 'djangocms_versioning/js/admin/versioning-actions.js' %}"></script>
 {% endblock %}
 
 {% block breadcrumbs %}{% endblock %}
@@ -20,10 +21,10 @@ <h4>{% blocktrans %} Version number: {{ version_number }}{% endblocktrans %}</h4
         <p>{{thing}}</p>
     {% endfor %}
 </div>
-<form action="" method="POST">
+<form action="" method="POST" class="js-close-sideframe">
     {% csrf_token %}
     <div class="submit-row">
-        <input  class="button confirm-link js-versioning-keep-sideframe"
+        <input  class="button confirm-link"
                 type="submit"
                 value="{% translate "Yes, I'm sure" %}">
         <a href="{{ back_url }}">