diff --git a/admin/survey/Branching.php b/admin/survey/Branching.php
index 0bd2a2d25..c4ddd9723 100644
--- a/admin/survey/Branching.php
+++ b/admin/survey/Branching.php
@@ -7936,27 +7936,29 @@ class Branching {
         echo '</div>';
 		echo '</div>';
 
-        echo '<div class="condition_editing_body">';
+        echo '<div class="calculation_editing_title">';
         echo '<h2>'.$lang['srv_editcalculation'].'</h2>';
         echo '</div>';
+        
 
+        echo '<div class="calculation_editing_body">';
         $sql = sisplet_query("SELECT * FROM srv_calculation WHERE cnd_id = '$condition' ORDER BY vrstni_red");
         if (mysqli_num_rows($sql) == 0) {
             sisplet_query("INSERT INTO srv_calculation (id, cnd_id, vrstni_red) VALUES ('', '$condition', '1')");
             $sql = sisplet_query("SELECT * FROM srv_calculation WHERE cnd_id = '$condition' ORDER BY vrstni_red");
         }
         while ($row = mysqli_fetch_array($sql)) {
-
             $this->calculation_edit($row['id'], $vrednost);
         }
+        echo '</div>';
+
 
         echo '<p id="calculation_editing_operators" style="margin-left:62px; height:50px;">'.$lang['srv_add_cond'].':
-        <a href="#" onclick="calculation_add(\''.$condition.'\', \'0\', \''.$vrednost.'\'); return false;"><strong style="font-size:18px">&nbsp;+&nbsp;</strong></a>,
-        <a href="#" onclick="calculation_add(\''.$condition.'\', \'1\', \''.$vrednost.'\'); return false;"><strong style="font-size:18px">&nbsp;-&nbsp;</strong></a>,
-        <a href="#" onclick="calculation_add(\''.$condition.'\', \'2\', \''.$vrednost.'\'); return false;"><strong style="font-size:18px">&nbsp;*&nbsp;</strong></a>,
-        <a href="#" onclick="calculation_add(\''.$condition.'\', \'3\', \''.$vrednost.'\'); return false;"><strong style="font-size:18px">&nbsp;/&nbsp;</strong></a>
-        </p><br><br>';
-
+                <a href="#" onclick="calculation_add(\''.$condition.'\', \'0\', \''.$vrednost.'\'); return false;"><strong style="font-size:18px">&nbsp;+&nbsp;</strong></a>,
+                <a href="#" onclick="calculation_add(\''.$condition.'\', \'1\', \''.$vrednost.'\'); return false;"><strong style="font-size:18px">&nbsp;-&nbsp;</strong></a>,
+                <a href="#" onclick="calculation_add(\''.$condition.'\', \'2\', \''.$vrednost.'\'); return false;"><strong style="font-size:18px">&nbsp;*&nbsp;</strong></a>,
+                <a href="#" onclick="calculation_add(\''.$condition.'\', \'3\', \''.$vrednost.'\'); return false;"><strong style="font-size:18px">&nbsp;/&nbsp;</strong></a>
+            </p><br><br>';
     }
 
     /**
diff --git a/public/css/admin.css b/public/css/admin.css
index 1fa89e660..5f74017d2 100644
--- a/public/css/admin.css
+++ b/public/css/admin.css
@@ -9074,6 +9074,16 @@ body.waitlong #loading {
   margin-bottom: 40px;
   overflow: auto;
 }
+#calculation .calculation_editing_body {
+  max-height: 40vh;
+  overflow-y: auto;
+  margin: 20px 0;
+  padding: 10px 5px 5px 5px;
+  border: 1px #E6E6E6 solid;
+}
+#calculation .calculation_editing_body .tbl_condition_editing {
+  margin-bottom: 5px;
+}
 #calculation #condition_editing_close {
   float: right;
   margin: 20px 20px 20px 0;
diff --git a/resources/sass/admin/popup/settings.scss b/resources/sass/admin/popup/settings.scss
index 56b228815..e73d66341 100644
--- a/resources/sass/admin/popup/settings.scss
+++ b/resources/sass/admin/popup/settings.scss
@@ -205,6 +205,21 @@
 		margin-bottom: 40px;
 		overflow: auto;
 	}
+
+    .calculation_editing_body{
+		max-height: 40vh;
+        overflow-y: auto;
+
+        margin: 20px 0;
+        padding: 10px 5px 5px 5px;
+
+        border: 1px $fieldset_border solid;
+
+        .tbl_condition_editing{
+            margin-bottom: 5px;
+        }
+	}
+
 	#condition_editing_close {
 		float: right;
         margin: 20px 20px 20px 0;