diff --git a/Eve-O-Preview/Configuration/Implementation/ThumbnailConfiguration.cs b/Eve-O-Preview/Configuration/Implementation/ThumbnailConfiguration.cs
index afeeae5..2d65319 100644
--- a/Eve-O-Preview/Configuration/Implementation/ThumbnailConfiguration.cs
+++ b/Eve-O-Preview/Configuration/Implementation/ThumbnailConfiguration.cs
@@ -36,6 +36,8 @@ namespace EveOPreview.Configuration.Omplementation
 			this.ThumbnailMinimumSize = new Size(192, 108);
 			this.ThumbnailMaximumSize = new Size(960, 540);
 
+			this.EnableThumbnailSnap = true;
+
 			this.ThumbnailZoomEnabled = false;
 			this.ThumbnailZoomFactor = 2;
 			this.ThumbnailZoomAnchor = ZoomAnchor.NW;
@@ -91,6 +93,8 @@ namespace EveOPreview.Configuration.Omplementation
 		public Size ThumbnailMaximumSize { get; set; }
 		public Size ThumbnailMinimumSize { get; set; }
 
+		public bool EnableThumbnailSnap { get; set; }
+
 		[JsonProperty("EnableThumbnailZoom")]
 		public bool ThumbnailZoomEnabled { get; set; }
 		public int ThumbnailZoomFactor { get; set; }
diff --git a/Eve-O-Preview/Configuration/Interface/IThumbnailConfiguration.cs b/Eve-O-Preview/Configuration/Interface/IThumbnailConfiguration.cs
index 6a55156..d182f78 100644
--- a/Eve-O-Preview/Configuration/Interface/IThumbnailConfiguration.cs
+++ b/Eve-O-Preview/Configuration/Interface/IThumbnailConfiguration.cs
@@ -21,6 +21,8 @@ namespace EveOPreview.Configuration
 		Size ThumbnailMinimumSize { get; set; }
 		Size ThumbnailMaximumSize { get; set; }
 
+		bool EnableThumbnailSnap { get; set; }
+
 		bool ThumbnailZoomEnabled { get; set; }
 		int ThumbnailZoomFactor { get; set; }
 		ZoomAnchor ThumbnailZoomAnchor { get; set; }
diff --git a/Eve-O-Preview/Services/Implementation/ThumbnailManager.cs b/Eve-O-Preview/Services/Implementation/ThumbnailManager.cs
index 65cf64a..509d29e 100644
--- a/Eve-O-Preview/Services/Implementation/ThumbnailManager.cs
+++ b/Eve-O-Preview/Services/Implementation/ThumbnailManager.cs
@@ -222,7 +222,7 @@ namespace EveOPreview.Services
 			{
 				if ((locationChange.ActiveClient == this._activeClient.Title) && this._thumbnailViews.TryGetValue(locationChange.Handle, out var view))
 				{
-					this.DockThumbnailView(view);
+					this.SnapThumbnailView(view);
 
 					this.RaiseThumbnailLocationUpdatedNotification(view.Title, this._activeClient.Title, view.ThumbnailLocation);
 				}
@@ -472,8 +472,14 @@ namespace EveOPreview.Services
 			this.EnableViewEvents();
 		}
 
-		private void DockThumbnailView(IThumbnailView view)
+		private void SnapThumbnailView(IThumbnailView view)
 		{
+			// Check if this feature is enabled
+			if (!this._configuration.EnableThumbnailSnap)
+			{
+				return;
+			}
+
 			// Only borderless thumbnails can be docked
 			if (this._configuration.ShowThumbnailFrames)
 			{