diff --git a/base/project.js b/base/project.js
index 781492ea..5daf5479 100644
--- a/base/project.js
+++ b/base/project.js
@@ -134,7 +134,6 @@ else if (platform == "android") {
 	}
 	project.target_options.android.package           = flags.package;
 	project.target_options.android.permissions       = [ "android.permission.READ_MEDIA_IMAGES", "android.permission.INTERNET" ];
-	project.target_options.android.screenOrientation = [ "sensorLandscape" ];
 	project.target_options.android.minSdkVersion     = 35; // android 15
 	project.target_options.android.targetSdkVersion  = 36;
 	project.target_options.android.versionCode       = get_version_code();
diff --git a/paint/sources/base.ts b/paint/sources/base.ts
index ac83e90b..718e2689 100644
--- a/paint/sources/base.ts
+++ b/paint/sources/base.ts
@@ -1798,6 +1798,15 @@ function ui_base_show_material_nodes() {
 		ui_view2d_show = false;
 	}
 
+	if (config_raw.touch_ui && ui_nodes_show && iron_window_width() < iron_window_height()) {
+		ui_view2d_show = false;
+		base_view3d_show = false;
+	}
+
+	if (config_raw.touch_ui && !ui_nodes_show && iron_window_width() < iron_window_height()) {
+		base_view3d_show = true;
+	}
+
 	base_resize();
 }
 
@@ -1811,6 +1820,15 @@ function ui_base_show_brush_nodes() {
 		ui_view2d_show = false;
 	}
 
+	if (config_raw.touch_ui && ui_nodes_show && iron_window_width() < iron_window_height()) {
+		ui_view2d_show = false;
+		base_view3d_show = false;
+	}
+
+	if (config_raw.touch_ui && !ui_nodes_show && iron_window_width() < iron_window_height()) {
+		base_view3d_show = true;
+	}
+
 	base_resize();
 }
 
@@ -1830,6 +1848,30 @@ function ui_base_show_2d_view(type: view_2d_type_t) {
 		ui_nodes_show = false;
 	}
 
+	if (config_raw.touch_ui && ui_view2d_show && iron_window_width() < iron_window_height()) {
+		ui_nodes_show = false;
+		base_view3d_show = false;
+	}
+
+	if (config_raw.touch_ui && !ui_view2d_show && iron_window_width() < iron_window_height()) {
+		base_view3d_show = true;
+	}
+
+	base_resize();
+}
+
+function ui_base_show_3d_view() {
+	if (!base_view3d_show) {
+		if (config_raw.touch_ui && ui_nodes_show && ui_view2d_show) {
+			ui_view2d_show = false;
+		}
+		if (config_raw.touch_ui && (ui_nodes_show || ui_view2d_show) && iron_window_width() < iron_window_height()) {
+			ui_nodes_show = false;
+			ui_view2d_show = false;
+		}
+	}
+
+	base_view3d_show = !base_view3d_show;
 	base_resize();
 }
 
diff --git a/paint/sources/ui_toolbar.ts b/paint/sources/ui_toolbar.ts
index aee711c0..07e44fa1 100644
--- a/paint/sources/ui_toolbar.ts
+++ b/paint/sources/ui_toolbar.ts
@@ -136,11 +136,7 @@ function ui_toolbar_draw_show_3d_view() {
 			let _w: i32             = ui._w;
 			ui._w                   = toolbar_w;
 			if (ui_icon_button("", icon_t.CUBE)) {
-				if (config_raw.touch_ui && ui_nodes_show && ui_view2d_show) {
-					ui_view2d_show = false;
-				}
-				base_view3d_show = true;
-				base_resize();
+				ui_base_show_3d_view();
 			}
 			ui._w                   = _w;
 			ui.ops.theme.ELEMENT_H  = _ELEMENT_H;
@@ -260,11 +256,7 @@ function ui_toolbar_tool_properties_menu() {
 		}
 
 		if (ui_button(base_view3d_show ? tr("Hide 3D View") : tr("Show 3D View"), ui_align_t.LEFT)) {
-			base_view3d_show = !base_view3d_show;
-			if (base_view3d_show && ui_nodes_show && ui_view2d_show) {
-				ui_view2d_show = false;
-			}
-			base_resize();
+			ui_base_show_3d_view();
 		}
 
 	}, ui._x + ui._w + 6 * UI_SCALE(), y);