diff --git a/martor/templates/martor/bootstrap/toolbar.html b/martor/templates/martor/bootstrap/toolbar.html
index 62b93c07..c3f5d047 100644
--- a/martor/templates/martor/bootstrap/toolbar.html
+++ b/martor/templates/martor/bootstrap/toolbar.html
@@ -1,7 +1,7 @@
 {% load i18n %}
 
-<div class="btn-toolbar float-right martor-toolbar w-100" role="toolbar" aria-label="{% trans 'Martor Toolbar Buttons' %}">
-  <div class="btn-group btn-group-sm w-100" role="group" aria-label="First group">
+<div class="btn-toolbar float-end martor-toolbar ms-lg-auto" role="toolbar" aria-label="{% trans 'Martor Toolbar Buttons' %}">
+  <div class="btn-group btn-group-sm ms-lg-auto" role="group" aria-label="First group">
     {% if 'bold' in toolbar_buttons %}
       <span class="btn btn-light markdown-selector markdown-bold" title="{% trans 'Bold' %} (Ctrl+B)">
         <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-type-bold" fill="currentColor" xmlns="http://www.w3.org/2000/svg">