diff --git a/css/80_app.css b/css/80_app.css
index c68e76455..4c4745b1e 100644
--- a/css/80_app.css
+++ b/css/80_app.css
@@ -3450,19 +3450,23 @@ img.tile-removing {
     right: 60px;
 }
 
-.badge .tooltip {
+li:first-of-type .badge .tooltip,
+li.hide + li.version .badge .tooltip {
     left: auto !important;
     right: 5px !important;
 }
-[dir='rtl'] .badge .tooltip {
+[dir='rtl'] li:first-of-type .badge .tooltip,
+[dir='rtl'] li.hide + li.version .badge .tooltip {
     left: 5px !important;
     right: auto !important;
 }
-.badge .tooltip .tooltip-arrow {
+li:first-of-type .badge .tooltip .tooltip-arrow,
+li.hide + li.version .badge .tooltip .tooltip-arrow {
     right: 15px !important;
     left: auto !important;
 }
-[dir='rtl'] .badge .tooltip .tooltip-arrow {
+[dir='rtl'] li:first-of-type .badge .tooltip .tooltip-arrow,
+[dir='rtl'] li.hide + li.version .badge .tooltip .tooltip-arrow {
     left: 15px !important;
     right: auto !important;
 }
diff --git a/modules/ui/init.js b/modules/ui/init.js
index ec38b78bf..8908bd27a 100644
--- a/modules/ui/init.js
+++ b/modules/ui/init.js
@@ -197,6 +197,7 @@ export function uiInit(context) {
 
         aboutList
             .append('li')
+            .attr('class', 'version')
             .call(uiVersion(context));
 
         var issueLinks = aboutList