diff --git a/source/blender/src/drawview.c b/source/blender/src/drawview.c
index 12ff5c5a26e..39f76172c5c 100644
--- a/source/blender/src/drawview.c
+++ b/source/blender/src/drawview.c
@@ -1493,11 +1493,10 @@ static void view3d_panel_object(short cntrl)	// VIEW3D_HANDLER_OBJECT
 	uiPanelControl(UI_PNL_SOLID | UI_PNL_CLOSE | cntrl);
 	uiSetPanelHandler(VIEW3D_HANDLER_OBJECT);  // for close and esc
 	
-	if ((ob!=G.obedit) && (G.f & (G_VERTEXPAINT|G_TEXTUREPAINT))) {
-		if(uiNewPanel(curarea, block, "Paint", "View3d", 10, 230, 318, 204)==0) return;
-	} else {
-		if(uiNewPanel(curarea, block, "Transform Properties", "View3d", 10, 230, 318, 204)==0) return;
-	}
+/* (ton) can't use the rename trick for paint... panel names and settings are stored in the files and
+   used to find previous locations when re-open. This causes flipping */
+
+	if(uiNewPanel(curarea, block, "Transform Properties", "View3d", 10, 230, 318, 204)==0) return;
 	
 	if((G.f & (G_VERTEXPAINT|G_TEXTUREPAINT))==0) {
 		uiDefBut(block, TEX, B_IDNAME, "OB: ",	10,180,140,20, ob->id.name+2, 0.0, 18.0, 0, 0, "");
diff --git a/source/blender/src/interface.c b/source/blender/src/interface.c
index 8d2bc86404b..6a28bb61b7b 100644
--- a/source/blender/src/interface.c
+++ b/source/blender/src/interface.c
@@ -2317,9 +2317,10 @@ static int ui_do_but_HSVCUBE(uiBut *but)
 			
 			/* relative position within box */
 			x= ((float)mval[0]-but->x1)/(but->x2-but->x1);
-			y= ((float)mval[1]-but->y1)/(but->x2-but->x1);
+			y= ((float)mval[1]-but->y1)/(but->y2-but->y1);
 			
 			/* we're hacking values now to prevent rgb_to_hsv working wrong */
+			/* (ton) doesnt work yet... */
 			CLAMP(x, 0.0005, 0.9995);
 			CLAMP(y, 0.0005, 0.9995);