diff --git a/src/add-ons/accelerants/nvidia/GetAccelerantHook.c b/src/add-ons/accelerants/nvidia/GetAccelerantHook.c
index 188d6fde01..286f517db2 100644
--- a/src/add-ons/accelerants/nvidia/GetAccelerantHook.c
+++ b/src/add-ons/accelerants/nvidia/GetAccelerantHook.c
@@ -4,7 +4,7 @@
 	
 	Other authors:
 	Mark Watson,
-	Rudolf Cornelissen 10/2002-10/2005
+	Rudolf Cornelissen 10/2002-11/2005
 */
 
 #define MODULE_BIT 0x08000000
@@ -175,36 +175,17 @@ status_t check_overlay_capability(uint32 feature)
 		break;
 	}
 
-	/* all supported cards have a bes, but... */
-	switch (si->ps.card_arch)
+	/* all older cards have a supported bes */
+	if ((si->ps.card_type <= NV40) || (si->ps.card_type == NV45))
 	{
-	case NV04A:
-	case NV10A:
-	case NV20A:
-	case NV30A:
-		/* all older cards have a supported bes */
 		LOG(4, ("Overlay: Exporting hook %s.\n", msg));
 		return B_OK;
-		break;
-	case NV40A:
-	default:
-		switch (si->ps.card_type)
-		{
-		case NV40:
-		case NV45:
-			/* all GeForce 6800's cards have a supported bes */
-			LOG(4, ("Overlay: Exporting hook %s.\n", msg));
-			return B_OK;
-			break;
-		default:
-			/* all NV40 architecture cards have a new HDTV capable bes except for
-			 * GeForce 6800's. Unfortunately we have no info about the new bes yet. */
-			LOG(4, ("Overlay: Not exporting hook %s.\n", msg));
-			return B_ERROR;
-			break;
-		}
-		break;
 	}
+
+	/* all newer NV40 architecture cards have a new HDTV capable bes except for
+	 * GeForce 6800's. Unfortunately we have no info about the new bes yet. */
+	LOG(4, ("Overlay: Not exporting hook %s.\n", msg));
+	return B_ERROR;
 }
 
 status_t check_acc_capability(uint32 feature)
diff --git a/src/add-ons/accelerants/nvidia/ProposeDisplayMode.c b/src/add-ons/accelerants/nvidia/ProposeDisplayMode.c
index 5787c76f9e..f3820b5bb6 100644
--- a/src/add-ons/accelerants/nvidia/ProposeDisplayMode.c
+++ b/src/add-ons/accelerants/nvidia/ProposeDisplayMode.c
@@ -535,8 +535,9 @@ status_t PROPOSE_DISPLAY_MODE(display_mode *target, const display_mode *low, con
 	if (si->settings.hardcursor)
 		target->flags |= B_HARDWARE_CURSOR;
 
-	/* set SUPPORTS_OVERLAYS */
-	target->flags |= B_SUPPORTS_OVERLAYS;
+	/* set SUPPORTS_OVERLAYS if suitable */
+	if ((si->ps.card_type <= NV40) || (si->ps.card_type == NV45))
+		target->flags |= B_SUPPORTS_OVERLAYS;
 
 	LOG(1, ("PROPOSEMODE: validated modeflags: $%08x\n", target->flags));