diff --git a/main/survey/app/Controllers/BodyController.php b/main/survey/app/Controllers/BodyController.php
index 4117132ed..787aa9698 100644
--- a/main/survey/app/Controllers/BodyController.php
+++ b/main/survey/app/Controllers/BodyController.php
@@ -2070,8 +2070,6 @@ class BodyController extends Controller
 
             echo '<div id="preview-window">';
 
-
-
             echo '<div id="preview_switch">';
 
             // Preklop na celostranski preview
@@ -2439,8 +2437,6 @@ class BodyController extends Controller
 
             ?><script>
                 if (localStorage.preview_popup == 1) {
-                    $('#preview-holder, #preview_switch').hide();
-
                     $('.preview_icon_open').show();
                     $('.preview_icon_close').hide();
                     
diff --git a/main/survey/js/script.js b/main/survey/js/script.js
index 31292a063..8b4434d90 100644
--- a/main/survey/js/script.js
+++ b/main/survey/js/script.js
@@ -1247,8 +1247,6 @@ function return_edit_send (site_url, lang_id) {
 
 function preview_popup_close () {
 	
-    $('#preview-holder, #nacina').fadeOut('medium');
-
     $('#preview-window').addClass('closed');
 
     $('.preview_icon_open').show();
@@ -1259,8 +1257,6 @@ function preview_popup_close () {
 
 function preview_popup_open () {
 	
-    $('#preview-holder, #nacina').fadeIn('medium');
-
     $('#preview-window').removeClass('closed');
 
     $('.preview_icon_open').hide();
diff --git a/public/css/main.css b/public/css/main.css
index d33e2e054..9d99a6ad2 100644
--- a/public/css/main.css
+++ b/public/css/main.css
@@ -7296,16 +7296,26 @@ button.ui-datepicker-trigger::before {
   top: 45px;
   right: 10px;
   width: 265px;
-  min-height: 32px;
   font-size: 12px;
   background-color: white;
   box-shadow: 0px 0px 7px rgba(0, 0, 0, 0.12);
   border-radius: 2px;
   padding: 16px;
+  transition: 0.5s all;
 }
 #preview-window.closed {
-  background-color: transparent;
-  border: 0;
+  /*background-color: transparent;
+  border: 0;*/
+}
+#preview-window.closed #preview_switch {
+  padding-bottom: 0;
+  border-bottom: 0;
+}
+#preview-window.closed #preview_switch #nacina {
+  display: none;
+}
+#preview-window.closed #preview-holder {
+  display: none;
 }
 #preview-window b,
 #preview-window .bold {
diff --git a/resources/sass/main/main/admin.scss b/resources/sass/main/main/admin.scss
index 2226bec56..fb3e10bd7 100644
--- a/resources/sass/main/main/admin.scss
+++ b/resources/sass/main/main/admin.scss
@@ -123,7 +123,7 @@
     right: 10px;
 
     width: 265px;
-    min-height: 32px;
+    //min-height: 32px;
 
     font-size: 12px;
 
@@ -134,10 +134,24 @@
 
     padding: 16px;
 
-    &.closed{
+    transition: 0.5s all;
 
-        background-color: transparent;
-        border: 0;
+    &.closed{
+        /*background-color: transparent;
+        border: 0;*/
+
+        #preview_switch{
+            padding-bottom: 0;
+            border-bottom: 0;
+
+            #nacina{
+                display: none;
+            }
+        }
+
+        #preview-holder{
+            display: none;
+        }
     }
 
     b,