diff --git a/packages/client/src/pages/about.vue b/packages/client/src/pages/about.vue
index 3e951c00b1..10dc4483ad 100644
--- a/packages/client/src/pages/about.vue
+++ b/packages/client/src/pages/about.vue
@@ -15,12 +15,7 @@
 				:modules="[Virtual]"
 				:space-between="20"
 				:virtual="true"
-				:allow-touch-move="
-					!(
-						deviceKind === 'desktop' &&
-						!defaultStore.state.swipeOnDesktop
-					)
-				"
+				:allow-touch-move="defaultStore.state.swipeOnMobile && ( deviceKind !== 'desktop' || defaultStore.state.swipeOnDesktop )"
 				@swiper="setSwiperRef"
 				@slide-change="onSlideChange"
 			>
diff --git a/packages/client/src/pages/admin-file.vue b/packages/client/src/pages/admin-file.vue
index 63a8132861..1a0f8b4555 100644
--- a/packages/client/src/pages/admin-file.vue
+++ b/packages/client/src/pages/admin-file.vue
@@ -15,12 +15,7 @@
 				:modules="[Virtual]"
 				:space-between="20"
 				:virtual="true"
-				:allow-touch-move="
-					!(
-						deviceKind === 'desktop' &&
-						!defaultStore.state.swipeOnDesktop
-					)
-				"
+				:allow-touch-move="defaultStore.state.swipeOnMobile && ( deviceKind !== 'desktop' || defaultStore.state.swipeOnDesktop )"
 				@swiper="setSwiperRef"
 				@slide-change="onSlideChange"
 			>
diff --git a/packages/client/src/pages/channels.vue b/packages/client/src/pages/channels.vue
index b79985bafb..ada861c463 100644
--- a/packages/client/src/pages/channels.vue
+++ b/packages/client/src/pages/channels.vue
@@ -18,12 +18,7 @@
 				:modules="[Virtual]"
 				:space-between="20"
 				:virtual="true"
-				:allow-touch-move="
-					!(
-						deviceKind === 'desktop' &&
-						!defaultStore.state.swipeOnDesktop
-					)
-				"
+				:allow-touch-move="defaultStore.state.swipeOnMobile && ( deviceKind !== 'desktop' || defaultStore.state.swipeOnDesktop )"
 				@swiper="setSwiperRef"
 				@slide-change="onSlideChange"
 			>
diff --git a/packages/client/src/pages/explore.vue b/packages/client/src/pages/explore.vue
index 9202d78878..790d1e400c 100644
--- a/packages/client/src/pages/explore.vue
+++ b/packages/client/src/pages/explore.vue
@@ -16,12 +16,7 @@
 					:modules="[Virtual]"
 					:space-between="20"
 					:virtual="true"
-					:allow-touch-move="
-						!(
-							deviceKind === 'desktop' &&
-							!defaultStore.state.swipeOnDesktop
-						)
-					"
+					:allow-touch-move="defaultStore.state.swipeOnMobile && ( deviceKind !== 'desktop' || defaultStore.state.swipeOnDesktop )"
 					@swiper="setSwiperRef"
 					@slide-change="onSlideChange"
 				>
diff --git a/packages/client/src/pages/gallery/index.vue b/packages/client/src/pages/gallery/index.vue
index 92fb22354b..66eb72f83e 100644
--- a/packages/client/src/pages/gallery/index.vue
+++ b/packages/client/src/pages/gallery/index.vue
@@ -16,12 +16,7 @@
 				:modules="[Virtual]"
 				:space-between="20"
 				:virtual="true"
-				:allow-touch-move="
-					!(
-						deviceKind === 'desktop' &&
-						!defaultStore.state.swipeOnDesktop
-					)
-				"
+				:allow-touch-move="defaultStore.state.swipeOnMobile && ( deviceKind !== 'desktop' || defaultStore.state.swipeOnDesktop )"
 				@swiper="setSwiperRef"
 				@slide-change="onSlideChange"
 			>
diff --git a/packages/client/src/pages/instance-info.vue b/packages/client/src/pages/instance-info.vue
index 73c1051e1f..4d18961603 100644
--- a/packages/client/src/pages/instance-info.vue
+++ b/packages/client/src/pages/instance-info.vue
@@ -20,12 +20,7 @@
 				:modules="[Virtual]"
 				:space-between="20"
 				:virtual="true"
-				:allow-touch-move="
-					!(
-						deviceKind === 'desktop' &&
-						!defaultStore.state.swipeOnDesktop
-					)
-				"
+				:allow-touch-move="defaultStore.state.swipeOnMobile && ( deviceKind !== 'desktop' || defaultStore.state.swipeOnDesktop )"
 				@swiper="setSwiperRef"
 				@slide-change="onSlideChange"
 			>
diff --git a/packages/client/src/pages/messaging/index.vue b/packages/client/src/pages/messaging/index.vue
index ba385e3958..f97aa6526a 100644
--- a/packages/client/src/pages/messaging/index.vue
+++ b/packages/client/src/pages/messaging/index.vue
@@ -16,12 +16,7 @@
 					:modules="[Virtual]"
 					:space-between="20"
 					:virtual="true"
-					:allow-touch-move="
-						!(
-							deviceKind === 'desktop' &&
-							!defaultStore.state.swipeOnDesktop
-						)
-					"
+					:allow-touch-move="defaultStore.state.swipeOnMobile && ( deviceKind !== 'desktop' || defaultStore.state.swipeOnDesktop )"
 					@swiper="setSwiperRef"
 					@slide-change="onSlideChange"
 				>
diff --git a/packages/client/src/pages/notifications.vue b/packages/client/src/pages/notifications.vue
index bda42a8b4a..95bd3a0197 100644
--- a/packages/client/src/pages/notifications.vue
+++ b/packages/client/src/pages/notifications.vue
@@ -17,12 +17,7 @@
 				:modules="[Virtual]"
 				:space-between="20"
 				:virtual="true"
-				:allow-touch-move="
-					!(
-						deviceKind === 'desktop' &&
-						!defaultStore.state.swipeOnDesktop
-					)
-				"
+				:allow-touch-move="defaultStore.state.swipeOnMobile && ( deviceKind !== 'desktop' || defaultStore.state.swipeOnDesktop )"
 				@swiper="setSwiperRef"
 				@slide-change="onSlideChange"
 			>
diff --git a/packages/client/src/pages/pages.vue b/packages/client/src/pages/pages.vue
index 1724ab27f0..9574ada76f 100644
--- a/packages/client/src/pages/pages.vue
+++ b/packages/client/src/pages/pages.vue
@@ -15,12 +15,7 @@
 				:modules="[Virtual]"
 				:space-between="20"
 				:virtual="true"
-				:allow-touch-move="
-					!(
-						deviceKind === 'desktop' &&
-						!defaultStore.state.swipeOnDesktop
-					)
-				"
+				:allow-touch-move="defaultStore.state.swipeOnMobile && ( deviceKind !== 'desktop' || defaultStore.state.swipeOnDesktop )"
 				@swiper="setSwiperRef"
 				@slide-change="onSlideChange"
 			>
diff --git a/packages/client/src/pages/search.vue b/packages/client/src/pages/search.vue
index be09daebcf..29fe4a23c8 100644
--- a/packages/client/src/pages/search.vue
+++ b/packages/client/src/pages/search.vue
@@ -16,12 +16,7 @@
 				:modules="[Virtual]"
 				:space-between="20"
 				:virtual="true"
-				:allow-touch-move="
-					!(
-						deviceKind === 'desktop' &&
-						!defaultStore.state.swipeOnDesktop
-					)
-				"
+				:allow-touch-move="defaultStore.state.swipeOnMobile && ( deviceKind !== 'desktop' || defaultStore.state.swipeOnDesktop )"
 				@swiper="setSwiperRef"
 				@slide-change="onSlideChange"
 			>
diff --git a/packages/client/src/pages/tag.vue b/packages/client/src/pages/tag.vue
index e5d8c674b1..2022fc7e20 100644
--- a/packages/client/src/pages/tag.vue
+++ b/packages/client/src/pages/tag.vue
@@ -16,12 +16,7 @@
 				:modules="[Virtual]"
 				:space-between="20"
 				:virtual="true"
-				:allow-touch-move="
-					!(
-						deviceKind === 'desktop' &&
-						!defaultStore.state.swipeOnDesktop
-					)
-				"
+				:allow-touch-move="defaultStore.state.swipeOnMobile && ( deviceKind !== 'desktop' || defaultStore.state.swipeOnDesktop )"
 				@swiper="setSwiperRef"
 				@slide-change="onSlideChange"
 			>