diff --git a/Eve-O-Preview/Presentation/ThumbnailManager.cs b/Eve-O-Preview/Presentation/ThumbnailManager.cs
index d79f023..bada1ac 100644
--- a/Eve-O-Preview/Presentation/ThumbnailManager.cs
+++ b/Eve-O-Preview/Presentation/ThumbnailManager.cs
@@ -122,13 +122,15 @@ namespace EveOPreview.UI
 					continue;
 				}
 
-				view.Location = this._configuration.GetThumbnailLocation(view.Title, this._activeClientTitle, view.Location);
-				view.IsOverlayEnabled = this._configuration.ShowThumbnailOverlays;
 				if (!this._isHoverEffectActive)
 				{
+					// No need to move Thumbnails while one of them is highlighted
+					view.Location = this._configuration.GetThumbnailLocation(view.Title, this._activeClientTitle, view.Location);
 					view.SetOpacity(this._configuration.ThumbnailsOpacity);
 				}
 
+				view.IsOverlayEnabled = this._configuration.ShowThumbnailOverlays;
+
 				if (!view.IsActive)
 				{
 					view.Show();