diff --git a/src/sao.less b/src/sao.less
index d792a197ce..2a6e5b8b35 100644
--- a/src/sao.less
+++ b/src/sao.less
@@ -129,7 +129,7 @@ button {
 
 .form {
     width: 100%;
-    & > table.form-container {
+    & table.form-container {
         width: 100%;
         & > tbody > tr > td {
             padding: 1px;
diff --git a/src/view/form.js b/src/view/form.js
index 19eb04de7d..3021b4f973 100644
--- a/src/view/form.js
+++ b/src/view/form.js
@@ -603,10 +603,18 @@ function eval_pyson(value){
                     } else {
                         cell.css('width', '');
                     }
+                    // show/hide when container is horizontal or vertical
+                    // to not show padding
                     if (cell.children().css('display') == 'none') {
                         cell.css('visibility', 'collapse');
+                        if (col <= 1) {
+                            cell.hide();
+                        }
                     } else {
                         cell.css('visibility', 'visible');
+                        if (col <= 1) {
+                            cell.show();
+                        }
                     }
                     i += colspan;
                 });