diff --git a/platypush/backend/http/webapp/src/components/panels/Execute/common.scss b/platypush/backend/http/webapp/src/components/panels/Execute/common.scss
index d05f2720c..2e6a3a3f2 100644
--- a/platypush/backend/http/webapp/src/components/panels/Execute/common.scss
+++ b/platypush/backend/http/webapp/src/components/panels/Execute/common.scss
@@ -150,6 +150,7 @@ form {
 
 .args-list {
   padding-top: 0.5em;
+  overflow: auto;
 
   @include until($tablet) {
     width: 100%;
@@ -187,6 +188,7 @@ form {
 }
 
 .args-body {
+  max-height: calc(50vh - 4.5em);
   display: flex;
   margin-top: 0.15em;
   margin-bottom: 1.5em;