diff --git a/source/blender/src/buttons_object.c b/source/blender/src/buttons_object.c
index 7f80a3f06f1..a708e8786b5 100644
--- a/source/blender/src/buttons_object.c
+++ b/source/blender/src/buttons_object.c
@@ -1805,6 +1805,9 @@ static void object_panel_object(Object *ob)
 			yco+= 40;
 		}
 	}
+	
+	if(120-yco < -10)
+		uiNewPanelHeight(block, 204 - (120-yco));
 }
 
 static void object_panel_anim(Object *ob)
diff --git a/source/blender/src/view.c b/source/blender/src/view.c
index 5e87923b111..51ef76e1f44 100644
--- a/source/blender/src/view.c
+++ b/source/blender/src/view.c
@@ -602,17 +602,6 @@ void viewmove(int mode)
 					G.vd->view= 0;
 				}
 				if(G.vd->persp==2 && mode!=1 && G.vd->camera) {
-					float upvec[3]={0,0,0}; /* the view vector */
-					float mat[3][3]; /* view matrix 3x3 to rotate the upvec */
-					where_is_object(G.vd->camera);
-					VecCopyf(G.vd->ofs, G.vd->camera->obmat[3]);
-					VecMulf(G.vd->ofs, -1.0f); /*flip the vector*/
-					
-					upvec[2]= G.vd->dist;
-					Mat3CpyMat4(mat, G.vd->viewinv);
-					Mat3MulVecfl(mat, upvec);
-					VecAddf(G.vd->ofs, G.vd->ofs, upvec);
-					
 					G.vd->persp= 1;
 					scrarea_do_windraw(curarea);
 					scrarea_queue_headredraw(curarea);