diff --git a/admin/survey/Branching.php b/admin/survey/Branching.php
index dd823be09..4182ac0d7 100644
--- a/admin/survey/Branching.php
+++ b/admin/survey/Branching.php
@@ -6948,28 +6948,28 @@ class Branching {
 
 
         // conjunction
-        echo '<td class="tbl_ce_tb white" style="width:70px; text-align:center">';
+        echo '<td class="tbl_ce_tb white" style="width:80px; text-align:center">';
+
+        $operator = $row['conjunction'].'_'.$row['negation'];
+
+        echo '<input type="hidden" name="conjunction_'.$condition.'" id="conjunction_'.$condition.'" value="'.$row['conjunction'].'_'.$row['negation'].'" />';
+
+        // Prikazujemo samo pri prvem in ce je ze izbran not
         if ($row['vrstni_red'] == 1) {
-        	echo '<input type="hidden" name="conjunction_'.$condition.'" id="conjunction_'.$condition.'" value="'.$row['conjunction'].'_'.$row['negation'].'" />';
 
-			// prikazujemo samo ce je ze izbran not
-            if ($row['negation']==1)
-				echo '<span style="font-weight:bold"><a href="#" onclick="conjunction_edit(\''.$condition.'\', \'0\', \'0\'); return false;">&nbsp;&nbsp;not&nbsp;&nbsp;</a></span>';
-
-        } else {
-
-			echo '<input type="hidden" name="conjunction_'.$condition.'" id="conjunction_'.$condition.'" value="'.$row['conjunction'].'_'.$row['negation'].'" />';
-
-			if ($row['conjunction']==0 && $row['negation']==0)
-				echo '<span style="font-weight:bold"><a href="#" onclick="conjunction_edit(\''.$condition.'\', \'1\', \'0\'); return false;" title="'.$lang['srv_edit_condition_conjunction'].'">&nbsp;&nbsp;AND&nbsp;&nbsp;</a></span>';
-			if ($row['conjunction']==1 && $row['negation']==0)
-				echo '<span style="font-weight:bold"><a href="#" onclick="conjunction_edit(\''.$condition.'\', \'0\', \'1\'); return false;" title="'.$lang['srv_edit_condition_conjunction'].'">&nbsp;&nbsp;OR&nbsp;&nbsp;</a></span>';
-			if ($row['conjunction']==0 && $row['negation']==1)
-				echo '<span style="font-weight:bold"><a href="#" onclick="conjunction_edit(\''.$condition.'\', \'1\', \'1\'); return false;" title="'.$lang['srv_edit_condition_conjunction'].'">&nbsp;AND NOT&nbsp;</a></span>';
-			if ($row['conjunction']==1 && $row['negation']==1)
-				echo '<span style="font-weight:bold"><a href="#" onclick="conjunction_edit(\''.$condition.'\', \'0\', \'0\'); return false;" title="'.$lang['srv_edit_condition_conjunction'].'">&nbsp;OR NOT&nbsp;</a></span>';
+            if($row['negation'] == 1)
+			    echo '<span style="font-weight:bold"><a href="#" onclick="conjunction_edit(\''.$condition.'\', \'0\', \'0\'); return false;">&nbsp;&nbsp;not&nbsp;&nbsp;</a></span>';
+        } 
+        else {
 
+            echo '<select name="conjunction_dropdown_'.$condition.'" id="conjunction_dropdown_'.$condition.'" onChange="conjunction_dropdown_edit(\''.$condition.'\'); return false;">';
+            echo '  <option value="0_0" '.($operator == '0_0' ? 'selected="selected"' : '').'>AND</option>';
+            echo '  <option value="1_0" '.($operator == '1_0' ? 'selected="selected"' : '').'>OR</option>';
+            echo '  <option value="0_1" '.($operator == '0_1' ? 'selected="selected"' : '').'>AND NOT</option>';
+            echo '  <option value="1_1" '.($operator == '1_1' ? 'selected="selected"' : '').'>OR NOT</option>';
+            echo '</select>';
         }
+        
         echo '</td>';
 
 	    // display bracket
diff --git a/admin/survey/script/branching.js b/admin/survey/script/branching.js
index 02703def1..bb23d3077 100644
--- a/admin/survey/script/branching.js
+++ b/admin/survey/script/branching.js
@@ -1507,6 +1507,27 @@ function conjunction_edit(condition, conjunction, negation) {
 
 }
 
+function conjunction_dropdown_edit(condition) {
+
+    var conj = $('#conjunction_dropdown_' + condition).val().split('_');
+
+    var conjunction = conj[0];
+    var negation = conj[1];
+
+    $('#div_condition_editing_inner').load('ajax.php?t=branching&a=conjunction_edit',
+        {
+            condition: condition,
+            conjunction: conjunction,
+            negation: negation,
+            noupdate: __vnosi + __analiza,
+            anketa: srv_meta_anketa_id
+        }, function () {
+            centerDiv2Page('#div_condition_editing');
+            $('#div_condition_editing_inner').resize();	// trigger, da se poklice resize event
+        }
+    );
+}
+
 function fill_value(condition, vrednost) {
 
     var spr_id = document.getElementById('spremenljivka_' + condition);