diff --git a/platypush/backend/http/webapp/src/components/panels/Extensions/Index.vue b/platypush/backend/http/webapp/src/components/panels/Extensions/Index.vue
index 77447c033..ce05307f3 100644
--- a/platypush/backend/http/webapp/src/components/panels/Extensions/Index.vue
+++ b/platypush/backend/http/webapp/src/components/panels/Extensions/Index.vue
@@ -250,6 +250,8 @@ $header-height: 3.25em;
   }
 
   .extension-container {
+    max-width: calc(100% - 1em);
+
     .extension {
       display: flex;
       flex-direction: column;
diff --git a/platypush/backend/http/webapp/src/style/components.scss b/platypush/backend/http/webapp/src/style/components.scss
index c1c2b2b2d..b87da3d42 100644
--- a/platypush/backend/http/webapp/src/style/components.scss
+++ b/platypush/backend/http/webapp/src/style/components.scss
@@ -52,7 +52,13 @@ a {
 }
 
 ::-webkit-scrollbar {
-  width: 0.75em;
+  width: 0.5em;
+  height: 0.5em;
+
+  @include until($tablet) {
+    width: 0.3333em;
+    height: 0.3333em;
+  }
 }
 
 ::-webkit-scrollbar-track {