diff --git a/app/src/main/java/com/simplemobiletools/camera/MainActivity.java b/app/src/main/java/com/simplemobiletools/camera/MainActivity.java
index ab42f194..9b693454 100644
--- a/app/src/main/java/com/simplemobiletools/camera/MainActivity.java
+++ b/app/src/main/java/com/simplemobiletools/camera/MainActivity.java
@@ -188,20 +188,20 @@ public class MainActivity extends AppCompatActivity implements SensorEventListen
         toggleCameraBtn.setVisibility(View.VISIBLE);
 
         if (isPhoto) {
-            initPhoto();
+            initPhotoButtons();
         } else {
-            initVideo();
+            initVideoButtons();
         }
     }
 
-    private void initPhoto() {
+    private void initPhotoButtons() {
         final Resources res = getResources();
         togglePhotoVideoBtn.setImageDrawable(res.getDrawable(R.mipmap.videocam));
         shutterBtn.setImageDrawable(res.getDrawable(R.mipmap.camera));
         preview.initPhotoMode();
     }
 
-    private void initVideo() {
+    private void initVideoButtons() {
         final Resources res = getResources();
         togglePhotoVideoBtn.setImageDrawable(res.getDrawable(R.mipmap.photo));
         shutterBtn.setImageDrawable(res.getDrawable(R.mipmap.video_rec));
@@ -258,8 +258,7 @@ public class MainActivity extends AppCompatActivity implements SensorEventListen
         }
 
         if (!isPhoto) {
-            preview.initRecorder();
-            initVideo();
+            initVideoButtons();
         }
     }
 
diff --git a/app/src/main/java/com/simplemobiletools/camera/Preview.java b/app/src/main/java/com/simplemobiletools/camera/Preview.java
index ab4829d1..e8572a7f 100644
--- a/app/src/main/java/com/simplemobiletools/camera/Preview.java
+++ b/app/src/main/java/com/simplemobiletools/camera/Preview.java
@@ -236,6 +236,10 @@ public class Preview extends ViewGroup implements SurfaceHolder.Callback, View.O
     @Override
     public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
         setupPreview();
+
+        if (isVideoMode) {
+            initRecorder();
+        }
     }
 
     private void setupPreview() {