diff --git a/Eve-O-Preview/Presentation/ThumbnailManager.cs b/Eve-O-Preview/Presentation/ThumbnailManager.cs
index e50c672..7e44202 100644
--- a/Eve-O-Preview/Presentation/ThumbnailManager.cs
+++ b/Eve-O-Preview/Presentation/ThumbnailManager.cs
@@ -284,10 +284,13 @@ namespace EveOPreview.UI
 
 			IThumbnailView view = this._thumbnailViews[id];
 
-			this.ThumbnailZoomIn(view);
 			view.SetTopMost(true);
-
 			view.SetOpacity(1.0);
+
+			if (this._configuration.EnableThumbnailZoom)
+			{
+				this.ThumbnailZoomIn(view);
+			}
 		}
 
 		private void ThumbnailViewLostFocus(IntPtr id)
@@ -299,10 +302,13 @@ namespace EveOPreview.UI
 
 			IThumbnailView view = this._thumbnailViews[id];
 
-			this.ThumbnailZoomOut(view);
-
 			view.SetOpacity(this._configuration.ThumbnailsOpacity);
 
+			if (this._configuration.EnableThumbnailZoom)
+			{
+				this.ThumbnailZoomOut(view);
+			}
+
 			this._isHoverEffectActive = false;
 		}