diff --git a/source/blender/src/toets.c b/source/blender/src/toets.c
index 93d38ad6b34..2b6327df80c 100644
--- a/source/blender/src/toets.c
+++ b/source/blender/src/toets.c
@@ -139,8 +139,10 @@ void persptoetsen(unsigned short event)
 	}
 	else if((G.qual & (LR_SHIFTKEY | LR_CTRLKEY)) && (event != PAD0)) {
 		
-		/* indicate that this view is inverted */
-		G.vd->flag2 |= V3D_OPP_DIRECTION_NAME;
+		/* Indicate that this view is inverted,
+		 * but only if it actually _was_ inverted (jobbe) */
+		if (event==PAD7 || event == PAD1 || event == PAD3)
+			G.vd->flag2 |= V3D_OPP_DIRECTION_NAME;
 		
 		if(event==PAD0) {
 			/* G.vd->persp= 3; */
@@ -201,8 +203,11 @@ void persptoetsen(unsigned short event)
 		}
 	}
 	else {
-		/* indicate that this view is not inverted */
-		G.vd->flag2 &= ~V3D_OPP_DIRECTION_NAME;
+		/* Indicate that this view is not inverted.
+		 * Don't do this for PADMINUS/PADPLUSKEY, though. (jobbe)*/
+		if (event != PADMINUS && event != PADPLUSKEY)
+			G.vd->flag2 &= ~V3D_OPP_DIRECTION_NAME;
+		
 
 		if(event==PAD7) {
 			G.vd->viewquat[0]= 1.0;