diff --git a/Source/Core/Windows/FlatBrowserForm.cs b/Source/Core/Windows/FlatBrowserForm.cs
index c031d8f0..847f8d4f 100644
--- a/Source/Core/Windows/FlatBrowserForm.cs
+++ b/Source/Core/Windows/FlatBrowserForm.cs
@@ -153,10 +153,12 @@ namespace CodeImp.DoomBuilder.Windows
 				}
 			}
 
-			// Still none found? Then select the first
-			if(!foundselecttexture)
-				texturesets.Items[0].Selected = true;
+			// WARNING: Some strange behavior of the listview here!
+			// When you leave this line out, the list becomes very slow.
+			// Also, this does not change the item selected previously.
+			texturesets.Items[0].Selected = true;
 
+			// Texture to select when list is filled
 			selecttextureonfill = selecttexture;
 
 			// Make groups
diff --git a/Source/Core/Windows/TextureBrowserForm.cs b/Source/Core/Windows/TextureBrowserForm.cs
index 5323ae91..fe2b17ea 100644
--- a/Source/Core/Windows/TextureBrowserForm.cs
+++ b/Source/Core/Windows/TextureBrowserForm.cs
@@ -154,10 +154,12 @@ namespace CodeImp.DoomBuilder.Windows
 				}
 			}
 
-			// Still none found? Then select the first
-			if(!foundselecttexture)
-				texturesets.Items[0].Selected = true;
+			// WARNING: Some strange behavior of the listview here!
+			// When you leave this line out, the list becomes very slow.
+			// Also, this does not change the item selected previously.
+			texturesets.Items[0].Selected = true;
 
+			// Texture to select when list is filled
 			selecttextureonfill = selecttexture;
 			
 			// Make groups