diff --git a/package-lock.json b/package-lock.json
index 17e1df1f..e5027773 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "simple-staking",
-  "version": "0.2.30",
+  "version": "0.2.31",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "simple-staking",
-      "version": "0.2.30",
+      "version": "0.2.31",
       "dependencies": {
         "@bitcoinerlab/secp256k1": "^1.1.1",
         "@keystonehq/animated-qr": "^0.8.6",
diff --git a/package.json b/package.json
index e3df98c8..b9087f41 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "simple-staking",
-  "version": "0.2.30",
+  "version": "0.2.31",
   "private": true,
   "scripts": {
     "dev": "next dev",
diff --git a/src/app/components/Connect/ConnectSmall.tsx b/src/app/components/Connect/ConnectSmall.tsx
index 906e6b38..21d33c78 100644
--- a/src/app/components/Connect/ConnectSmall.tsx
+++ b/src/app/components/Connect/ConnectSmall.tsx
@@ -54,7 +54,7 @@ export const ConnectSmall: React.FC<ConnectSmallProps> = ({
         >
           <AiOutlineInfoCircle />
         </span>
-        <Tooltip id="tooltip-connect" />
+        <Tooltip id="tooltip-connect" className="tooltip-wrap" />
       </>
     );
   };
diff --git a/src/app/components/Delegations/Delegation.tsx b/src/app/components/Delegations/Delegation.tsx
index 65109f9b..b3ff0dd0 100644
--- a/src/app/components/Delegations/Delegation.tsx
+++ b/src/app/components/Delegations/Delegation.tsx
@@ -152,7 +152,7 @@ export const Delegation: React.FC<DelegationProps> = ({
             >
               <AiOutlineInfoCircle />
             </span>
-            <Tooltip id={`tooltip-${stakingTxHash}`} />
+            <Tooltip id={`tooltip-${stakingTxHash}`} className="tooltip-wrap" />
           </div>
         </div>
         {generateActionButton()}
diff --git a/src/app/components/FinalityProviders/FinalityProvider.tsx b/src/app/components/FinalityProviders/FinalityProvider.tsx
index ae38488d..ef88076a 100644
--- a/src/app/components/FinalityProviders/FinalityProvider.tsx
+++ b/src/app/components/FinalityProviders/FinalityProvider.tsx
@@ -95,7 +95,7 @@ export const FinalityProvider: React.FC<FinalityProviderProps> = ({
           0
         )}
       </div>
-      <Tooltip id="tooltip-missing" />
+      <Tooltip id="tooltip-missing" className="tooltip-wrap" />
     </div>
   );
 };
diff --git a/src/app/components/FinalityProviders/FinalityProviders.tsx b/src/app/components/FinalityProviders/FinalityProviders.tsx
index 0ac6da29..9d8668f1 100644
--- a/src/app/components/FinalityProviders/FinalityProviders.tsx
+++ b/src/app/components/FinalityProviders/FinalityProviders.tsx
@@ -82,8 +82,8 @@ export const FinalityProviders: React.FC<FinalityProvidersProps> = ({
           )}
         </InfiniteScroll>
       </div>
-      <Tooltip id="tooltip-delegations" />
-      <Tooltip id="tooltip-stake" />
+      <Tooltip id="tooltip-delegations" className="tooltip-wrap" />
+      <Tooltip id="tooltip-stake" className="tooltip-wrap" />
     </div>
   );
 };
diff --git a/src/app/components/Modals/ConnectModal.tsx b/src/app/components/Modals/ConnectModal.tsx
index 9c7fefd0..7ff42c9f 100644
--- a/src/app/components/Modals/ConnectModal.tsx
+++ b/src/app/components/Modals/ConnectModal.tsx
@@ -224,7 +224,7 @@ export const ConnectModal: React.FC<ConnectModalProps> = ({
                           >
                             <AiOutlineInfoCircle />
                           </span>
-                          <Tooltip id={name} />
+                          <Tooltip id={name} className="tooltip-wrap" />
                         </div>
                       )}
                     </div>
diff --git a/src/app/components/Stakers/Stakers.tsx b/src/app/components/Stakers/Stakers.tsx
index 8ff9954e..d4068422 100644
--- a/src/app/components/Stakers/Stakers.tsx
+++ b/src/app/components/Stakers/Stakers.tsx
@@ -89,8 +89,8 @@ export const Stakers: React.FC<StakersProps> = () => {
           <LoadingView />
         )}
       </div>
-      <Tooltip id="tooltip-delegations" />
-      <Tooltip id="tooltip-stake" />
+      <Tooltip id="tooltip-delegations" className="tooltip-wrap" />
+      <Tooltip id="tooltip-stake" className="tooltip-wrap" />
     </div>
   );
 };
diff --git a/src/app/components/Staking/FinalityProviders/FinalityProvider.tsx b/src/app/components/Staking/FinalityProviders/FinalityProvider.tsx
index 11b3837c..b576eec5 100644
--- a/src/app/components/Staking/FinalityProviders/FinalityProvider.tsx
+++ b/src/app/components/Staking/FinalityProviders/FinalityProvider.tsx
@@ -79,7 +79,7 @@ export const FinalityProvider: React.FC<FinalityProviderProps> = ({
               >
                 <AiOutlineInfoCircle size={16} />
               </span>
-              <Tooltip id="tooltip-missing-fp" />
+              <Tooltip id="tooltip-missing-fp" className="tooltip-wrap" />
               <span>No data provided</span>
             </div>
           )}
@@ -100,7 +100,10 @@ export const FinalityProvider: React.FC<FinalityProviderProps> = ({
           >
             <AiOutlineInfoCircle />
           </span>
-          <Tooltip id={`tooltip-delegation-${pkHex}`} />
+          <Tooltip
+            id={`tooltip-delegation-${pkHex}`}
+            className="tooltip-wrap"
+          />
         </div>
         <div className="flex items-center justify-end gap-1 lg:justify-start">
           <p className="hidden sm:flex lg:hidden">Commission:</p>
@@ -115,7 +118,10 @@ export const FinalityProvider: React.FC<FinalityProviderProps> = ({
           >
             <AiOutlineInfoCircle />
           </span>
-          <Tooltip id={`tooltip-delegation-${pkHex}`} />
+          <Tooltip
+            id={`tooltip-delegation-${pkHex}`}
+            className="tooltip-wrap"
+          />
         </div>
       </div>
     </div>
diff --git a/src/app/components/Staking/Staking.tsx b/src/app/components/Staking/Staking.tsx
index 50e2e09a..fbab9a12 100644
--- a/src/app/components/Staking/Staking.tsx
+++ b/src/app/components/Staking/Staking.tsx
@@ -629,7 +629,7 @@ export const Staking: React.FC<StakingProps> = ({
               >
                 Preview
               </button>
-              <Tooltip id="tooltip-staking-preview" />
+              <Tooltip id="tooltip-staking-preview" className="tooltip-wrap" />
             </span>
             {previewReady && (
               <PreviewModal
diff --git a/src/app/components/Stats/Stats.tsx b/src/app/components/Stats/Stats.tsx
index f5d37843..07183386 100644
--- a/src/app/components/Stats/Stats.tsx
+++ b/src/app/components/Stats/Stats.tsx
@@ -197,7 +197,10 @@ export const Stats: React.FC = () => {
                         >
                           <AiOutlineInfoCircle />
                         </span>
-                        <Tooltip id={`tooltip-${subSection.title}`} />
+                        <Tooltip
+                          id={`tooltip-${subSection.title}`}
+                          className="tooltip-wrap"
+                        />
                       </>
                     )}
                   </div>
diff --git a/src/app/globals.css b/src/app/globals.css
index 8e50c77b..3810a469 100644
--- a/src/app/globals.css
+++ b/src/app/globals.css
@@ -110,3 +110,9 @@ input[type="number"] {
 body.modal-open {
   overflow: hidden;
 }
+
+.tooltip-wrap {
+  max-width: 20rem;
+  white-space: normal;
+  word-wrap: break-word;
+}