diff --git a/src/add-ons/accelerants/nvidia/ProposeDisplayMode.c b/src/add-ons/accelerants/nvidia/ProposeDisplayMode.c
index 3deb96d39c..0313e3af5c 100644
--- a/src/add-ons/accelerants/nvidia/ProposeDisplayMode.c
+++ b/src/add-ons/accelerants/nvidia/ProposeDisplayMode.c
@@ -4,7 +4,7 @@
 
 	Other authors for NV driver:
 	Mark Watson,
-	Rudolf Cornelissen 9/2002-10/2005
+	Rudolf Cornelissen 9/2002-11/2005
 */
 
 #define MODULE_BIT 0x00400000
diff --git a/src/add-ons/accelerants/nvidia/SetDisplayMode.c b/src/add-ons/accelerants/nvidia/SetDisplayMode.c
index d4ba02b5d7..59d287ca6a 100644
--- a/src/add-ons/accelerants/nvidia/SetDisplayMode.c
+++ b/src/add-ons/accelerants/nvidia/SetDisplayMode.c
@@ -6,7 +6,7 @@
 	Other authors:
 	Mark Watson,
 	Apsed,
-	Rudolf Cornelissen 11/2002-10/2005
+	Rudolf Cornelissen 11/2002-11/2005
 */
 
 #define MODULE_BIT 0x00200000
@@ -520,33 +520,63 @@ status_t SET_DPMS_MODE(uint32 dpms_flags)
 	}
 
 	/* CRTC used for TVout needs specific DPMS programming */
-	//fixme: assuming tvout is on head1, while head assignment is straight!!
 	if (si->dm.flags & TV_BITS)
 	{
-		LOG(4,("SET_DPMS_MODE: tuning DPMS settings for TVout compatibility\n"));
-
-		if (!(si->settings.vga_on_tv))
+		if (si->dm.flags & TV_PRIMARY)
 		{
-			/* block VGA output on head displaying on TV */
-			/* Note:
-			 * this specific sync setting is required: Vsync is used to keep TVout
-			 * synchronized to the CRTC 'vertically' (otherwise 'rolling' occurs).
-			 * This leaves Hsync only for shutting off the VGA screen. */
-			h1h = false;
-			h1v = true;
+			LOG(4,("SET_DPMS_MODE: tuning primary head DPMS settings for TVout compatibility\n"));
+
+			if (!(si->settings.vga_on_tv))
+			{
+				/* block VGA output on head displaying on TV */
+				/* Note:
+				 * this specific sync setting is required: Vsync is used to keep TVout
+				 * synchronized to the CRTC 'vertically' (otherwise 'rolling' occurs).
+				 * This leaves Hsync only for shutting off the VGA screen. */
+				h1h = false;
+				h1v = true;
+			}
+			else
+			{
+				/* when concurrent VGA is used alongside TVout on a head, DPMS is safest
+				 * applied this way: Vsync is needed for stopping TVout successfully when
+				 * a (new) modeswitch occurs.
+				 * (see routine BT_stop_tvout() in nv_brooktreetv.c) */
+				/* Note:
+				 * applying 'normal' DPMS here and forcing Vsync on in the above mentioned
+				 * routine seems to not always be enough: sometimes image generation will
+				 * not resume in that case. */
+				h1h = display;
+				h1v = true;
+			}
 		}
 		else
 		{
-			/* when concurrent VGA is used alongside TVout on a head, DPMS is safest
-			 * applied this way: Vsync is needed for stopping TVout successfully when
-			 * a (new) modeswitch occurs.
-			 * (see routine BT_stop_tvout() in nv_brooktreetv.c) */
-			/* Note:
-			 * applying 'normal' DPMS here and forcing Vsync on in the above mentioned
-			 * routine seems to not always be enough: sometimes image generation will
-			 * not resume in that case. */
-			h1h = display;
-			h1v = true;
+			LOG(4,("SET_DPMS_MODE: tuning secondary head DPMS settings for TVout compatibility\n"));
+
+			if (!(si->settings.vga_on_tv))
+			{
+				/* block VGA output on head displaying on TV */
+				/* Note:
+				 * this specific sync setting is required: Vsync is used to keep TVout
+				 * synchronized to the CRTC 'vertically' (otherwise 'rolling' occurs).
+				 * This leaves Hsync only for shutting off the VGA screen. */
+				h2h = false;
+				h2v = true;
+			}
+			else
+			{
+				/* when concurrent VGA is used alongside TVout on a head, DPMS is safest
+				 * applied this way: Vsync is needed for stopping TVout successfully when
+				 * a (new) modeswitch occurs.
+				 * (see routine BT_stop_tvout() in nv_brooktreetv.c) */
+				/* Note:
+				 * applying 'normal' DPMS here and forcing Vsync on in the above mentioned
+				 * routine seems to not always be enough: sometimes image generation will
+				 * not resume in that case. */
+				h2h = display;
+				h2v = true;
+			}
 		}
 	}
 
diff --git a/src/add-ons/accelerants/nvidia/engine/nv_brooktreetv.c b/src/add-ons/accelerants/nvidia/engine/nv_brooktreetv.c
index 348eb0d26b..4b04da1ab4 100644
--- a/src/add-ons/accelerants/nvidia/engine/nv_brooktreetv.c
+++ b/src/add-ons/accelerants/nvidia/engine/nv_brooktreetv.c
@@ -1,6 +1,6 @@
 /*
 	Author:
-	Rudolf Cornelissen 4/2002-10/2005
+	Rudolf Cornelissen 4/2002-11/2005
 */
 
 #define MODULE_BIT 0x00100000
@@ -1581,24 +1581,9 @@ static status_t BT_update_mode_for_gpu(display_mode *target, uint8 tvmode)
 static status_t BT_start_tvout(display_mode tv_target)
 {
 	if (tv_target.flags & TV_PRIMARY)
-	{
-		if (si->ps.secondary_head)
-		{
-			/* switch TV encoder to CRTC1 */
-			NV_REG32(NV32_2FUNCSEL) &= ~0x00000100;
-			NV_REG32(NV32_FUNCSEL) |= 0x00000100;
-		}
-
 		nv_crtc_start_tvout();
-	}
 	else
-	{
-		/* switch TV encoder to CRTC2 */
-		NV_REG32(NV32_FUNCSEL) &= ~0x00000100;
-		NV_REG32(NV32_2FUNCSEL) |= 0x00000100;
-
 		nv_crtc2_start_tvout();
-	}
 
 	return B_OK;
 }//end BT_start_tvout.
diff --git a/src/add-ons/accelerants/nvidia/engine/nv_crtc.c b/src/add-ons/accelerants/nvidia/engine/nv_crtc.c
index 5cc228f3c7..c2a692bc96 100644
--- a/src/add-ons/accelerants/nvidia/engine/nv_crtc.c
+++ b/src/add-ons/accelerants/nvidia/engine/nv_crtc.c
@@ -1,6 +1,6 @@
 /* CTRC functionality */
 /* Author:
-   Rudolf Cornelissen 11/2002-10/2005
+   Rudolf Cornelissen 11/2002-11/2005
 */
 
 #define MODULE_BIT 0x00040000
@@ -978,6 +978,13 @@ status_t nv_crtc_start_tvout(void)
 {
 	LOG(4,("CRTC: starting TV output\n"));
 
+	if (si->ps.secondary_head)
+	{
+		/* switch TV encoder to CRTC1 */
+		NV_REG32(NV32_2FUNCSEL) &= ~0x00000100;
+		NV_REG32(NV32_FUNCSEL) |= 0x00000100;
+	}
+
 	/* enable access to primary head */
 	set_crtc_owner(0);
 
diff --git a/src/add-ons/accelerants/nvidia/engine/nv_crtc2.c b/src/add-ons/accelerants/nvidia/engine/nv_crtc2.c
index ed1c596146..1bc2c4b5fb 100644
--- a/src/add-ons/accelerants/nvidia/engine/nv_crtc2.c
+++ b/src/add-ons/accelerants/nvidia/engine/nv_crtc2.c
@@ -1,6 +1,6 @@
 /* second CTRC functionality for GeForce cards */
 /* Author:
-   Rudolf Cornelissen 11/2002-10/2005
+   Rudolf Cornelissen 11/2002-11/2005
 */
 
 #define MODULE_BIT 0x00020000
@@ -825,6 +825,10 @@ status_t nv_crtc2_start_tvout(void)
 {
 	LOG(4,("CRTC2: starting TV output\n"));
 
+	/* switch TV encoder to CRTC2 */
+	NV_REG32(NV32_FUNCSEL) &= ~0x00000100;
+	NV_REG32(NV32_2FUNCSEL) |= 0x00000100;
+
 	/* enable access to secondary head */
 	set_crtc_owner(1);