diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index ed13aa5..b74dd10 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -1602,10 +1602,6 @@
         Size original = mParameters.getPreviewSize();
         if (!original.equals(optimalSize)) {
             mParameters.setPreviewSize(optimalSize.width, optimalSize.height);
-            if(optimalSize.width != 0 && optimalSize.height != 0) {
-                mUI.updatePreviewAspectRatio((float) optimalSize.width
-                        / (float) optimalSize.height);
-            }
 
             // Zoom related settings will be changed for different preview
             // sizes, so set and read the parameters to get latest values
@@ -1617,6 +1613,11 @@
             }
             mParameters = mCameraDevice.getParameters();
         }
+
+        if(optimalSize.width != 0 && optimalSize.height != 0) {
+            mUI.updatePreviewAspectRatio((float) optimalSize.width
+                    / (float) optimalSize.height);
+        }
         Log.v(TAG, "Preview size is " + optimalSize.width + "x" + optimalSize.height);
 
         // Since changing scene mode may change supported values, set scene mode
