diff --git a/client/components/tooltip/style.scss b/client/components/tooltip/style.scss
index 2bd7d4736bc..27122be036e 100644
--- a/client/components/tooltip/style.scss
+++ b/client/components/tooltip/style.scss
@@ -3,6 +3,11 @@
 		// ensures that the element needed for position calculations isn't included in the DOM layout
 		display: contents;
 
+		// fixes a UI bug where the tooltip can shift neighboring elements when it appears
+		> div {
+			display: inline;
+		}
+
 		// Styles for buttonIcon
 		[role='button'] {
 			cursor: pointer;
diff --git a/client/payment-details/dispute-details/style.scss b/client/payment-details/dispute-details/style.scss
index 10059607d3b..89bc42824b1 100644
--- a/client/payment-details/dispute-details/style.scss
+++ b/client/payment-details/dispute-details/style.scss
@@ -89,12 +89,6 @@
 			vertical-align: text-bottom;
 		}
 
-		.wcpay-tooltip__content-wrapper.wcpay-tooltip--click__content-wrapper
-			> .wcpay-tooltip__content-wrapper
-			+ div {
-			display: inline;
-		}
-
 		&__response-date {
 			display: inline-flex;
 			align-items: center;