diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 697d5d3b35..32a93a942e 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -2012,14 +2012,14 @@ void Application::updateMyAvatarLookAtPosition(glm::vec3& lookAtSpot, glm::vec3&
     bool showWarnings = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings);
     PerformanceWarning warn(showWarnings, "Application::updateMyAvatarLookAtPosition()");
     
-    if (!_lookatTargetAvatar) {
+    if (_myCamera.getMode() == CAMERA_MODE_MIRROR) {
+        lookAtSpot = _myCamera.getPosition();
+        
+    } else if (!_lookatTargetAvatar) {
         if (_isHoverVoxel) {
             //  Look at the hovered voxel
             lookAtSpot = getMouseVoxelWorldCoordinates(_hoverVoxel);
             
-        } else if (_myCamera.getMode() == CAMERA_MODE_MIRROR) {
-            lookAtSpot = _myCamera.getPosition();
-        
         } else {
             //  Just look in direction of the mouse ray
             const float FAR_AWAY_STARE = TREE_SCALE;
diff --git a/interface/src/avatar/Avatar.cpp b/interface/src/avatar/Avatar.cpp
index 8e8225200d..829c4f4464 100755
--- a/interface/src/avatar/Avatar.cpp
+++ b/interface/src/avatar/Avatar.cpp
@@ -398,6 +398,7 @@ void Avatar::simulate(float deltaTime, Transmitter* transmitter) {
         headPosition = _bodyBall[BODY_BALL_HEAD_BASE].position;
     }
     _head.setPosition(headPosition);
+    _head.setScale(_scale);
     _head.setSkinColor(glm::vec3(SKIN_COLOR[0], SKIN_COLOR[1], SKIN_COLOR[2]));
     _head.simulate(deltaTime, false);