diff --git a/collect_app/src/main/AndroidManifest.xml b/collect_app/src/main/AndroidManifest.xml
index c326c28af4c..30803e2ee55 100644
--- a/collect_app/src/main/AndroidManifest.xml
+++ b/collect_app/src/main/AndroidManifest.xml
@@ -127,7 +127,8 @@ the specific language governing permissions and limitations under the License.
             android:name="org.odk.collect.draw.DrawActivity"
             android:theme="@style/Theme.Collect"
             tools:replace="android:theme"
-            android:screenOrientation="landscape" />
+            android:screenOrientation="landscape"
+            android:resizeableActivity="false"/>
         <activity android:name=".activities.InstanceChooserList" />
         <activity
             android:name=".formlists.blankformlist.BlankFormListActivity"
diff --git a/draw/src/main/java/org/odk/collect/draw/DrawView.kt b/draw/src/main/java/org/odk/collect/draw/DrawView.kt
index ae2ae31be88..f1ff7bc2d3f 100644
--- a/draw/src/main/java/org/odk/collect/draw/DrawView.kt
+++ b/draw/src/main/java/org/odk/collect/draw/DrawView.kt
@@ -72,7 +72,10 @@ class DrawView(context: Context, attrs: AttributeSet?) : View(context, attrs) {
 
     override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
         super.onSizeChanged(w, h, oldw, oldh)
-        resetImage(w, h)
+
+        if (!::bitmap.isInitialized) {
+            resetImage(w, h)
+        }
     }
 
     override fun onDraw(canvas: Canvas) {
@@ -168,14 +171,14 @@ class DrawView(context: Context, attrs: AttributeSet?) : View(context, attrs) {
         paint.color = originalColor
     }
 
-    private fun resetImage(w: Int, h: Int) {
+    private fun resetImage(width: Int, height: Int) {
         val backgroundBitmapFile = File(imagePath)
         if (backgroundBitmapFile.exists()) {
-            bitmap = ImageFileUtils.getBitmapScaledToDisplay(backgroundBitmapFile, h, w, true)!!
+            bitmap = ImageFileUtils.getBitmapScaledToDisplay(backgroundBitmapFile, height, width, true)!!
                 .copy(Bitmap.Config.ARGB_8888, true)
             canvas = Canvas(bitmap)
         } else {
-            bitmap = Bitmap.createBitmap(w, h, Bitmap.Config.ARGB_8888)
+            bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888)
             canvas = Canvas(bitmap)
             canvas.drawColor(Color.WHITE)
             if (isSignature) {