diff --git a/frontend/src/app/components/addresses-treemap/addresses-treemap.component.scss b/frontend/src/app/components/addresses-treemap/addresses-treemap.component.scss
index 78510203f..8f5b607e6 100644
--- a/frontend/src/app/components/addresses-treemap/addresses-treemap.component.scss
+++ b/frontend/src/app/components/addresses-treemap/addresses-treemap.component.scss
@@ -1,5 +1,12 @@
-.node-channels-container {
+:host {
+  display: block;
+  width: 100%;
+}
+
+.node-channels-container,
+.addresses-treemap-container {
   position: relative;
+  width: 100%;
 }
 
 .loading-spinner {
diff --git a/frontend/src/app/components/addresses-treemap/addresses-treemap.component.ts b/frontend/src/app/components/addresses-treemap/addresses-treemap.component.ts
index 0ae1c9bcb..2270a781e 100644
--- a/frontend/src/app/components/addresses-treemap/addresses-treemap.component.ts
+++ b/frontend/src/app/components/addresses-treemap/addresses-treemap.component.ts
@@ -75,6 +75,7 @@ export class AddressesTreemap implements OnChanges {
           progressive: 100,
           tooltip: {
             show: true,
+            confine: true,
             backgroundColor: 'rgba(17, 19, 31, 1)',
             borderRadius: 4,
             shadowColor: 'rgba(0, 0, 0, 0.5)',
diff --git a/frontend/src/app/components/wallet/wallet.component.scss b/frontend/src/app/components/wallet/wallet.component.scss
index 6723cffbc..ccf3c665d 100644
--- a/frontend/src/app/components/wallet/wallet.component.scss
+++ b/frontend/src/app/components/wallet/wallet.component.scss
@@ -8,6 +8,18 @@
 .treemap-col {
   width: 45%;
   height: 300px;
+
+  @media (max-width: 767.98px) {
+    width: 100%;
+    min-width: 0;
+  }
+}
+
+@media (max-width: 767.98px) {
+  .treemap-col app-addresses-treemap {
+    display: block;
+    width: 100%;
+  }
 }
 
 .fiat {