diff --git a/Eve-O-Preview/Services/Implementation/ThumbnailManager.cs b/Eve-O-Preview/Services/Implementation/ThumbnailManager.cs
index 693e12d..e4c2a99 100644
--- a/Eve-O-Preview/Services/Implementation/ThumbnailManager.cs
+++ b/Eve-O-Preview/Services/Implementation/ThumbnailManager.cs
@@ -397,8 +397,6 @@ namespace EveOPreview.Services
 					this.UpdateClientLayouts();
 					this.RefreshThumbnails();
 				});
-
-			this.UpdateClientLayouts();
 		}
 
 		private void ThumbnailDeactivated(IntPtr id)
@@ -562,6 +560,11 @@ namespace EveOPreview.Services
 
 		private void ApplyClientLayout(IntPtr clientHandle, string clientTitle)
 		{
+			if (!this._configuration.EnableClientLayoutTracking)
+			{
+				return;
+			}
+
 			ClientLayout clientLayout = this._configuration.GetClientLayout(clientTitle);
 
 			if (clientLayout == null)