diff --git a/admin/survey/SurveyAdminAjax.php b/admin/survey/SurveyAdminAjax.php
index 89ebafdd2..73be9662e 100644
--- a/admin/survey/SurveyAdminAjax.php
+++ b/admin/survey/SurveyAdminAjax.php
@@ -6454,7 +6454,7 @@ class SurveyAdminAjax {
 
 		// Generičen alert popup - vsebina
 		echo '<h2>'.$lang['srv_warning'].'</h2>';
-		echo '<div class="popup_close"><a href="#" onClick="genericAlertPopupClose();">✕</a></div>';
+		echo '<div class="popup_close"><a href="#" onClick="popupClose(); return false;">✕</a></div>';
 		echo '<div class="popup_content">';
 		
 		
@@ -6698,7 +6698,7 @@ class SurveyAdminAjax {
 		echo '</div>';
 
 		echo '<div class="button_holder">';
-        echo '<button class="medium blue" onClick="genericAlertPopupClose(); return false;">OK</button>';
+        echo '<button class="medium blue" onClick="popupClose(); return false;">OK</button>';
         echo '</div>';
 	}
 
diff --git a/admin/survey/script/script.js b/admin/survey/script/script.js
index 45e4981d0..7dfef3d96 100644
--- a/admin/survey/script/script.js
+++ b/admin/survey/script/script.js
@@ -5510,16 +5510,10 @@ function genericAlertPopup(name, optional_parameter){
 	}
 
     $('#fade').fadeTo('slow', 1);
-	$('#general_popup').addClass('popup_orange');
     $('#general_popup').html('').fadeIn('slow');
     $("#general_popup").load('ajax.php?a=genericAlertPopup', {name:name, optional_parameter:optional_parameter});
 }
 
-function genericAlertPopupClose(){
-    popupClose();
-	$('#general_popup').removeClass('popup_orange');
-}
-
 //Toggle za prikaz nastavitev in opozoril v parapodatkih
 function toggleParapodatki(){