diff --git a/admin/survey/BranchingAjax.php b/admin/survey/BranchingAjax.php
index 9bfd260a7..2c55edd4d 100644
--- a/admin/survey/BranchingAjax.php
+++ b/admin/survey/BranchingAjax.php
@@ -2333,10 +2333,10 @@ class BranchingAjax {
 
 		if (($type == 0 || $view==3) && ($admin_type == 0 || $global_user_id==$rowanketa['insert_uid'])) {
 		
-			echo '<div style="float:right">';
+			echo '<div>';
 			
 			// Link na pregled splosnih komentarjev
-			echo '<span style="margin-right: 20px;"><a href="'.$site_url.'/admin/survey/index.php?anketa='.$this->anketa.'&a=komentarji_anketa">'.$lang['srv_comment_overview'].'</a></span>';	
+			echo '<span"><a href="'.$site_url.'/admin/survey/index.php?anketa='.$this->anketa.'&a=komentarji_anketa">'.$lang['srv_comment_overview'].'   </a>';	
 			
 			// Link na nastavitve komentarjev
 			echo '<a href="'.$site_url.'/admin/survey/index.php?anketa='.$this->anketa.'&a=urejanje">'.$lang['settings'].'</a>';
diff --git a/admin/survey/script/script.js b/admin/survey/script/script.js
index 7c5e58105..2197e2171 100644
--- a/admin/survey/script/script.js
+++ b/admin/survey/script/script.js
@@ -2189,7 +2189,7 @@ function load_comment (__this, show) {
 	}
 
     $(__this).qtip({
-        content: {text: '<div class=qtip_comment"><h1>'+naslov+'</h1><div id="survey_comment_'+$(__this).attr('spremenljivka')+'_'+$(__this).attr('view')+'"></div></div>', title: {button: '&#x2715;'}},
+        content: {text: '<div class="qtip_comment"><h1>'+naslov+'</h1><div id="survey_comment_'+$(__this).attr('spremenljivka')+'_'+$(__this).attr('view')+'"></div></div>', title: {button: '&#x2715;'}},
         fixed: false, show: {when: _when, ready: _ready, solo: true},hide: {when: 'click'},
         style: {name: 'light', border: {width: 3, radius: 8}, width: 350, tip: {corner: corners[i]}},
         position: {corner: {tooltip: corners[i], target: opposites[i] }, adjust: {screen : true}},
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 9aa4f94a3..c436b36cb 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -8061,6 +8061,25 @@ div.setting_holder .setting_item input[type=checkbox][disabled] + label:before {
   pointer-events: none;
 }
 
+div.qtip_comment {
+  padding: 2px 16px 16px 16px;
+}
+div.qtip_comment h1:before {
+  display: none;
+}
+div.qtip_comment div textarea {
+  width: 100%;
+  margin-bottom: 16px;
+}
+div.qtip_comment div .button_holder {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-end;
+}
+div.qtip_comment div .button_holder button:last-of-type {
+  margin-right: 0;
+}
+
 div.from_text_popup {
   overflow: hidden !important;
 }
diff --git a/resources/sass/admin_new/components/popup/page_specific.scss b/resources/sass/admin_new/components/popup/page_specific.scss
index 757ec04cb..ae3f19126 100644
--- a/resources/sass/admin_new/components/popup/page_specific.scss
+++ b/resources/sass/admin_new/components/popup/page_specific.scss
@@ -129,6 +129,37 @@ div.setting_holder {
     }
 }
 
+//Komentarji
+
+div.qtip_comment {
+    h1 {
+        &:before {
+            display: none;
+        }
+    }
+
+    padding: 2px 16px 16px 16px;
+
+    div {
+        textarea {
+            width: 100%;
+            margin-bottom: 16px;
+        }
+
+        .button_holder {
+            display: flex;
+            flex-direction: row;
+            justify-content:flex-end;
+
+            button {
+                &:last-of-type {
+                    margin-right: 0;
+                }
+            }
+        }
+    }
+}
+
 //Uvoz besedila
 div.from_text_popup {
     overflow: hidden !important;