diff --git a/resources/assets/javascripts/bootstrap/tooltip.js b/resources/assets/javascripts/bootstrap/tooltip.js
index 034fcf9a9d3c4ed476aa7d36f7fee62d4e4ea375..564d8db2f52b770d38f9c8f0ff163d256b4c0ff0 100644
--- a/resources/assets/javascripts/bootstrap/tooltip.js
+++ b/resources/assets/javascripts/bootstrap/tooltip.js
@@ -33,7 +33,7 @@ $(document).on('mouseenter mouseleave focusin focusout', '[data-tooltip],.toolti
             throw "Invalid content for tooltip via data";
         }
         if (!content) {
-            content = $(this).find('.tooltip-content').remove().html();
+            content = $(this).closest('.tooltip-content').html();
         }
         $(this).attr('title', null);
         $(this).attr('data-tooltip', content);
diff --git a/resources/assets/stylesheets/scss/tooltip.scss b/resources/assets/stylesheets/scss/tooltip.scss
index 4b7b36bbaffbfb769085c74e929393a4b22b8a4a..7566438c5c6f0376f1882696eff112ea2b6e29d7 100644
--- a/resources/assets/stylesheets/scss/tooltip.scss
+++ b/resources/assets/stylesheets/scss/tooltip.scss
@@ -34,11 +34,11 @@
         @include icon(before, info-circle, attention);
     }
 
-    .tooltip-content {
+    & + .tooltip-content {
         @extend %tooltip;
         display: none;
     }
-    &:hover .tooltip-content {
+    &:hover + .tooltip-content {
         bottom: 100%;
         display: inline-block;
         left: 50%;
diff --git a/templates/shared/tooltip.php b/templates/shared/tooltip.php
index d1ebafaf95a659e1a77a4c8f5105d409df42a024..4d9ab5f790f0d2b0ff647f037aac7da75b0f944f 100644
--- a/templates/shared/tooltip.php
+++ b/templates/shared/tooltip.php
@@ -1,8 +1,5 @@
 <span class="tooltip tooltip-icon <? if ($important) echo 'tooltip-important'; ?>"
       data-tooltip <? if (!$html) printf('title="%s"', htmlReady($text)) ?>
       tabindex="0" aria-describedby="tooltip_<?= htmlReady($tooltip_id) ?>">
-    <? if ($html): ?>
-        <span class="tooltip-content"><?= $text ?></span>
-    <? endif; ?>
 </span>
-<span id="tooltip_<?= htmlReady($tooltip_id) ?>" class="sr-only"><?= htmlReady($text) ?></span>
+<span id="tooltip_<?= htmlReady($tooltip_id) ?>" class="tooltip-content"><?= htmlReady($text) ?></span>