diff --git a/src/css/popup-fenix.css b/src/css/popup-fenix.css
index efa503073..926360e32 100644
--- a/src/css/popup-fenix.css
+++ b/src/css/popup-fenix.css
@@ -262,7 +262,9 @@ body[dir="rtl"] #tooltip {
     flex-grow: 1;
     justify-content: flex-end;
     padding-right: 2px;
-    width: calc(100% - 4em);
+    white-space: normal;
+    width: calc(100% - 5em);
+    word-break: break-word;
     }
 #firewallContainer > div.isCname > span:first-of-type {
     color: mediumblue;
@@ -343,6 +345,9 @@ body[dir="rtl"] #tooltip {
     content: '\2212\2212\2212';
     }
 
+body.advancedUser #firewallContainer > div > span:first-of-type {
+    width: calc(100% - 10em);
+    }
 body.advancedUser #firewallContainer > div > span:nth-of-type(2) {
     display: inline-flex;
     }
diff --git a/src/css/popup.css b/src/css/popup.css
index e42bf06bd..44aa5b167 100644
--- a/src/css/popup.css
+++ b/src/css/popup.css
@@ -282,7 +282,9 @@ body[dir="rtl"] #tooltip {
     flex-direction: column;
     justify-content: flex-end;
     padding-right: 2px;
+    white-space: normal;
     width: calc(100% - 4em);
+    word-break: break-word;
     }
 #firewallContainer > div.isCname > span:first-of-type {
     color: mediumblue;