diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index 52e812d87..acdf0a636 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -7722,7 +7722,7 @@ class SurveyAdminSettings {
 											echo '<p class="archive_comment" onclick="$.post(\'ajax.php?a=comment_ocena\', {type: \'question_comment\', ocena: (\'2\'), id: \''.$rowt['id'].'\', anketa: \''.$rowi['id'].'\'}, function () {window.location.reload();});"> <span class="faicon arhiv link-right"></span>';
 											echo $lang['srv_comments_archive'].'</p>';
 
-											echo '<div class="reply_to" onClick="$(\'#comment_toggle_'.$spr_id.'\').toggle();">';
+											echo '<div class="reply_to">';
 											echo '<a href="javascript:comment_on_comment(\''.$rowt['id'].'\',\''.$f->user($rowt['uid']).'\',\''.$f->datetime1($rowt['time']).'\',\''.$spr_id.'\');"><span class="faicon fa-reply link-right"></span>'.$lang['srv_comment_comment'].'</a>';
 											echo '</div>';
 											}
@@ -7893,7 +7893,7 @@ class SurveyAdminSettings {
 												echo '<p class="archive_comment" onclick="$.post(\'ajax.php?a=comment_ocena\', {type: \'question_comment\', ocena: (\'2\'), id: \''.$rowt['id'].'\', anketa: \''.$rowi['id'].'\'}, function () {window.location.reload();});"> <span class="faicon arhiv link-right"></span>';
 												echo $lang['srv_comments_archive'].'</p>';
 
-												echo '<div class="reply_to" onClick="$(\'#comment_toggle_'.$spr_id.'_4\').toggle();">';
+												echo '<div class="reply_to">';
 												echo '<a href="javascript:comment_on_comment(\''.$rowt['id'].'\',\''.$f->user($rowt['uid']).'\',\''.$datetime.'\',\''.$spr_id.'\');"><span class="faicon fa-reply link-right"></span>'.$lang['srv_comment_comment'].'</a>';
 												echo '</div>';
 											}
diff --git a/admin/survey/classes/tracking/CrossRoad.php b/admin/survey/classes/tracking/CrossRoad.php
index c917dbf33..8c1e216a6 100644
--- a/admin/survey/classes/tracking/CrossRoad.php
+++ b/admin/survey/classes/tracking/CrossRoad.php
@@ -127,7 +127,7 @@ class CrossRoad {
                     $second_action = NAVI_TESTIRANJE_KOMENTARJI;
 
                     $layout_width = 'narrow';
-                    if ($_GET['a'] == 'komentarji')
+                    if ($_GET['a'] == 'komentarji' || $_GET['a'] == 'komentarji_anketa')
                         $layout_width = 'wide';
 
                     $layout_menu = '';
diff --git a/admin/survey/script/vprasanje.js b/admin/survey/script/vprasanje.js
index 8a98f0104..6ec783475 100644
--- a/admin/survey/script/vprasanje.js
+++ b/admin/survey/script/vprasanje.js
@@ -740,8 +740,8 @@ function comment_on_comment (id, user, date, spr_id) {
 	$('#comment_on_comment_'+id).html(
 		'<div class="reply_to_who"><span class="faicon fa-reply link-right"></span>'+lang['for']+': '+user+' ('+date+')</div>'+
 		'<textarea name="vsebina" placeholder="'+lang['srv_comment_comment']+'" id="vsebina_comment_on_comment_'+id+'"></textarea>' +
-		'<div class="button_holder bottom0">'+
-		'<button class="medium white-blue" onclick="$(\'#comment_on_comment_'+id+'\').html(\'\'); $(\'#comment_toggle_'+spr_id+'_4\').toggle(); return false;">'+lang['edit1338']+'</button>'+
+		'<div class="button_holder bottom16">'+
+		'<button class="medium white-blue" onclick="$(\'#comment_on_comment_'+id+'\').html(\'\'); return false;">'+lang['edit1338']+'</button>'+
 		'<button class="medium blue" onclick="$.post(\'ajax.php?a=comment_on_comment\', {id: \''+id+'\', vsebina: $(\'#vsebina_comment_on_comment_'+id+'\').val(), anketa: srv_meta_anketa_id}, function() {window.location.reload();}); return false;">'+lang['srv_comment_comment']+'</button>'+
 		'</div>'
 	);