diff --git a/Playlist/PlaylistController.m b/Playlist/PlaylistController.m
index e0589225b..043278499 100644
--- a/Playlist/PlaylistController.m
+++ b/Playlist/PlaylistController.m
@@ -495,7 +495,7 @@ static void *playlistControllerContext = &playlistControllerContext;
 	}
 
 	NSView *view = [tableView makeViewWithIdentifier:cellIdentifier owner:nil];
-	if(view) {
+	if(view && [view isKindOfClass:[NSTableCellView class]]) {
 		NSTableCellView *cellView = (NSTableCellView *)view;
 		NSRect frameRect = cellView.frame;
 		frameRect.origin.y = 1;
diff --git a/Preferences/Preferences/GeneralPane.m b/Preferences/Preferences/GeneralPane.m
index 2d21b3315..b1a3adce0 100644
--- a/Preferences/Preferences/GeneralPane.m
+++ b/Preferences/Preferences/GeneralPane.m
@@ -67,7 +67,7 @@
 	}
 
 	NSView *view = [tableView makeViewWithIdentifier:cellIdentifier owner:nil];
-	if(view) {
+	if(view && [view isKindOfClass:[NSTableCellView class]]) {
 		NSTableCellView *cellView = (NSTableCellView *)view;
 
 		if(cellView.textField) {
diff --git a/Preferences/Preferences/PathSuggester.m b/Preferences/Preferences/PathSuggester.m
index b0c7661fa..b02ba1e3b 100644
--- a/Preferences/Preferences/PathSuggester.m
+++ b/Preferences/Preferences/PathSuggester.m
@@ -153,7 +153,7 @@
 	}
 
 	NSView *view = [tableView makeViewWithIdentifier:cellIdentifier owner:nil];
-	if(view) {
+	if(view && [view isKindOfClass:[NSTableCellView class]]) {
 		NSTableCellView *cellView = (NSTableCellView *)view;
 
 		if(cellView.textField) {