diff --git a/apps/settings/src/components/AppStoreSidebar/AppDetailsTab.vue b/apps/settings/src/components/AppStoreSidebar/AppDetailsTab.vue
index c44d27d582d29..e83458f6d8c1a 100644
--- a/apps/settings/src/components/AppStoreSidebar/AppDetailsTab.vue
+++ b/apps/settings/src/components/AppStoreSidebar/AppDetailsTab.vue
@@ -12,102 +12,6 @@
 			<NcIconSvgWrapper :path="mdiTextBoxOutline" />
 		</template>
 		<div class="app-details">
-			<div class="app-details__actions">
-				<div v-if="app.active && canLimitToGroups(app)" class="app-details__actions-groups">
-					<input
-						:id="`groups_enable_${app.id}`"
-						v-model="groupCheckedAppsData"
-						type="checkbox"
-						:value="app.id"
-						class="groups-enable__checkbox checkbox"
-						@change="setGroupLimit">
-					<label :for="`groups_enable_${app.id}`">{{ t('settings', 'Limit to groups') }}</label>
-					<input
-						type="hidden"
-						class="group_select"
-						:title="t('settings', 'All')"
-						value="">
-					<br>
-					<label for="limitToGroups">
-						<span>{{ t('settings', 'Limit app usage to groups') }}</span>
-					</label>
-					<NcSelect
-						v-if="isLimitedToGroups(app)"
-						input-id="limitToGroups"
-						:options="groups"
-						:model-value="appGroups"
-						:limit="5"
-						label="name"
-						:multiple="true"
-						keep-open
-						@option:selected="addGroupLimitation"
-						@option:deselected="removeGroupLimitation"
-						@search="asyncFindGroup">
-						<span slot="noResult">{{ t('settings', 'No results') }}</span>
-					</NcSelect>
-				</div>
-				<div class="app-details__actions-manage">
-					<input
-						v-if="app.update"
-						class="update primary"
-						type="button"
-						:value="t('settings', 'Update to {version}', { version: app.update })"
-						:disabled="installing || isLoading || isManualInstall"
-						@click="update(app.id)">
-					<input
-						v-if="app.canUnInstall"
-						class="uninstall"
-						type="button"
-						:value="t('settings', 'Remove')"
-						:disabled="installing || isLoading"
-						@click="remove(app.id, removeData)">
-					<input
-						v-if="app.active"
-						class="enable"
-						type="button"
-						:value="disableButtonText"
-						:disabled="installing || isLoading || isInitializing || isDeploying"
-						@click="disable(app.id)">
-					<input
-						v-if="!app.active && (app.canInstall || app.isCompatible)"
-						:title="enableButtonTooltip"
-						:aria-label="enableButtonTooltip"
-						class="enable primary"
-						type="button"
-						:value="enableButtonText"
-						:disabled="!app.canInstall || installing || isLoading || !defaultDeployDaemonAccessible || isInitializing || isDeploying"
-						@click="enableButtonAction">
-					<input
-						v-else-if="!app.active && !app.canInstall"
-						:title="forceEnableButtonTooltip"
-						:aria-label="forceEnableButtonTooltip"
-						class="enable force"
-						type="button"
-						:value="forceEnableButtonText"
-						:disabled="installing || isLoading"
-						@click="forceEnable(app.id)">
-					<NcButton
-						v-if="app?.app_api && (app.canInstall || app.isCompatible)"
-						:aria-label="t('settings', 'Advanced deploy options')"
-						variant="secondary"
-						@click="() => showDeployOptionsModal = true">
-						<template #icon>
-							<NcIconSvgWrapper :path="mdiToyBrickPlusOutline" />
-						</template>
-						{{ t('settings', 'Deploy options') }}
-					</NcButton>
-				</div>
-				<p v-if="!defaultDeployDaemonAccessible" class="warning">
-					{{ t('settings', 'Default Deploy daemon is not accessible') }}
-				</p>
-				<NcCheckboxRadioSwitch
-					v-if="app.canUnInstall"
-					:model-value="removeData"
-					:disabled="installing || isLoading || !defaultDeployDaemonAccessible"
-					@update:modelValue="toggleRemoveData">
-					{{ t('settings', 'Delete data on remove') }}
-				</NcCheckboxRadioSwitch>
-			</div>
 
 			<ul class="app-details__dependencies">
 				<li v-if="app.missingMinOwnCloudVersion">
@@ -208,10 +112,6 @@
 				</div>
 			</div>
 
-			<AppDeployOptionsModal
-				v-if="app?.app_api"
-				:show.sync="showDeployOptionsModal"
-				:app="app" />
 			<DaemonSelectionDialog
 				v-if="app?.app_api"
 				:show.sync="showSelectDaemonModal"
@@ -226,12 +126,9 @@ import { mdiBugOutline, mdiFeatureSearchOutline, mdiStar, mdiTextBoxOutline, mdi
 import { subscribe, unsubscribe } from '@nextcloud/event-bus'
 import NcAppSidebarTab from '@nextcloud/vue/components/NcAppSidebarTab'
 import NcButton from '@nextcloud/vue/components/NcButton'
-import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwitch'
 import NcDateTime from '@nextcloud/vue/components/NcDateTime'
 import NcIconSvgWrapper from '@nextcloud/vue/components/NcIconSvgWrapper'
-import NcSelect from '@nextcloud/vue/components/NcSelect'
 import DaemonSelectionDialog from '../AppAPI/DaemonSelectionDialog.vue'
-import AppDeployOptionsModal from './AppDeployOptionsModal.vue'
 import AppManagement from '../../mixins/AppManagement.js'
 import { useAppApiStore } from '../../store/app-api-store.js'
 import { useAppsStore } from '../../store/apps-store.js'
@@ -244,9 +141,6 @@ export default {
 		NcButton,
 		NcDateTime,
 		NcIconSvgWrapper,
-		NcSelect,
-		NcCheckboxRadioSwitch,
-		AppDeployOptionsModal,
 		DaemonSelectionDialog,
 	},
 
@@ -440,21 +334,6 @@ export default {
 .app-details {
 	padding: 20px;
 
-	&__actions {
-		// app management
-		&-manage {
-			// if too many, shrink them and ellipsis
-			display: flex;
-			align-items: center;
-			input {
-				flex: 0 1 auto;
-				min-width: 0;
-				text-overflow: ellipsis;
-				white-space: nowrap;
-				overflow: hidden;
-			}
-		}
-	}
 	&__authors {
 		color: var(--color-text-maxcontrast);
 	}
diff --git a/apps/settings/src/components/AppStoreSidebar/AppStoreSidebarManageActions.vue b/apps/settings/src/components/AppStoreSidebar/AppStoreSidebarManageActions.vue
new file mode 100644
index 0000000000000..cd7153428be8d
--- /dev/null
+++ b/apps/settings/src/components/AppStoreSidebar/AppStoreSidebarManageActions.vue
@@ -0,0 +1,216 @@
+<!--
+  - SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
+  - SPDX-License-Identifier: AGPL-3.0-or-later
+-->
+
+<template>
+	<div class="app-sidebar-manage__actions">
+		<div v-if="app.active && canLimitToGroups(app)" class="app-sidebar-manage__actions-groups">
+			<input
+				:id="`groups_enable_${app.id}`"
+				v-model="groupCheckedAppsData"
+				type="checkbox"
+				:value="app.id"
+				class="groups-enable__checkbox checkbox"
+				@change="setGroupLimit">
+			<label :for="`groups_enable_${app.id}`">{{ t('settings', 'Limit to groups') }}</label>
+			<input
+				type="hidden"
+				class="group_select"
+				:title="t('settings', 'All')"
+				value="">
+			<br>
+			<label for="limitToGroups">
+				<span>{{ t('settings', 'Limit app usage to groups') }}</span>
+			</label>
+			<NcSelect
+				v-if="isLimitedToGroups(app)"
+				input-id="limitToGroups"
+				:options="groups"
+				:model-value="appGroups"
+				:limit="5"
+				label="name"
+				:multiple="true"
+				keep-open
+				@option:selected="addGroupLimitation"
+				@option:deselected="removeGroupLimitation"
+				@search="asyncFindGroup">
+				<span slot="noResult">{{ t('settings', 'No results') }}</span>
+			</NcSelect>
+		</div>
+		<div class="app-sidebar-manage__actions-manage">
+			<input
+				v-if="app.update"
+				class="update primary"
+				type="button"
+				:value="t('settings', 'Update to {version}', { version: app.update })"
+				:disabled="installing || isLoading || isManualInstall"
+				@click="update(app.id)">
+			<input
+				v-if="app.canUnInstall"
+				class="uninstall"
+				type="button"
+				:value="t('settings', 'Remove')"
+				:disabled="installing || isLoading"
+				@click="remove(app.id, removeData)">
+			<input
+				v-if="app.active"
+				class="enable"
+				type="button"
+				:value="disableButtonText"
+				:disabled="installing || isLoading || isInitializing || isDeploying"
+				@click="disable(app.id)">
+			<input
+				v-if="!app.active && (app.canInstall || app.isCompatible)"
+				:title="enableButtonTooltip"
+				:aria-label="enableButtonTooltip"
+				class="enable primary"
+				type="button"
+				:value="enableButtonText"
+				:disabled="!app.canInstall || installing || isLoading || !defaultDeployDaemonAccessible || isInitializing || isDeploying"
+				@click="enableButtonAction">
+			<input
+				v-else-if="!app.active && !app.canInstall"
+				:title="forceEnableButtonTooltip"
+				:aria-label="forceEnableButtonTooltip"
+				class="enable force"
+				type="button"
+				:value="forceEnableButtonText"
+				:disabled="installing || isLoading"
+				@click="forceEnable(app.id)">
+			<NcButton
+				v-if="app?.app_api && (app.canInstall || app.isCompatible)"
+				:aria-label="t('settings', 'Advanced deploy options')"
+				variant="secondary"
+				@click="() => showDeployOptionsModal = true">
+				<template #icon>
+					<NcIconSvgWrapper :path="mdiToyBrickPlusOutline" />
+				</template>
+				{{ t('settings', 'Deploy options') }}
+			</NcButton>
+		</div>
+		<p v-if="!defaultDeployDaemonAccessible" class="warning">
+			{{ t('settings', 'Default Deploy daemon is not accessible') }}
+		</p>
+		<NcCheckboxRadioSwitch
+			v-if="app.canUnInstall"
+			:model-value="removeData"
+			:disabled="installing || isLoading || !defaultDeployDaemonAccessible"
+			@update:modelValue="toggleRemoveData">
+			{{ t('settings', 'Delete data on remove') }}
+		</NcCheckboxRadioSwitch>
+
+		<AppDeployOptionsModal
+			v-if="app?.app_api"
+			:show.sync="showDeployOptionsModal"
+			:app="app" />
+	</div>
+</template>
+
+<script>
+import { mdiToyBrickPlusOutline } from '@mdi/js'
+import { emit } from '@nextcloud/event-bus'
+import { translate as t } from '@nextcloud/l10n'
+import NcButton from '@nextcloud/vue/components/NcButton'
+import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwitch'
+import NcIconSvgWrapper from '@nextcloud/vue/components/NcIconSvgWrapper'
+import AppDeployOptionsModal from './AppDeployOptionsModal.vue'
+import AppManagement from '../../mixins/AppManagement.js'
+import { useAppApiStore } from '../../store/app-api-store.js'
+import { useAppsStore } from '../../store/apps-store.js'
+
+export default {
+	name: 'AppStoreSidebarManageActions',
+
+	components: {
+		NcButton,
+		NcCheckboxRadioSwitch,
+		NcIconSvgWrapper,
+		AppDeployOptionsModal,
+	},
+
+	mixins: [AppManagement],
+
+	props: {
+		app: {
+			type: Object,
+			required: true,
+		},
+	},
+
+	setup() {
+		const store = useAppsStore()
+		const appApiStore = useAppApiStore()
+		return {
+			store,
+			appApiStore,
+			t,
+			mdiToyBrickPlusOutline,
+		}
+	},
+
+	data() {
+		return {
+			removeData: false,
+			showDeployOptionsModal: false,
+		}
+	},
+
+	methods: {
+		toggleRemoveData() {
+			this.removeData = !this.removeData
+		},
+
+		async enableButtonAction() {
+			if (!this.app?.app_api) {
+				this.enable(this.app.id)
+				return
+			}
+			await this.appApiStore.fetchDockerDaemons()
+			if (this.appApiStore.dockerDaemons.length === 1 && this.app.needsDownload) {
+				this.enable(this.app.id, this.appApiStore.dockerDaemons[0])
+			} else if (this.app.needsDownload) {
+				emit('showDaemonSelectionModal')
+			} else {
+				this.enable(this.app.id, this.app.daemon)
+			}
+		},
+	},
+}
+</script>
+
+<style scoped lang="scss">
+.app-sidebar-manage {
+	&__actions {
+		display: flex;
+		align-items: center;
+		flex-wrap: wrap;
+		gap: 4px;
+
+		&-manage {
+			display: flex;
+			align-items: center;
+			input {
+				flex: 0 1 auto;
+				min-width: 0;
+				text-overflow: ellipsis;
+				white-space: nowrap;
+				overflow: hidden;
+			}
+		}
+	}
+}
+
+.force {
+	color: var(--color-text-error);
+	border-color: var(--color-border-error);
+	background: var(--color-main-background);
+}
+
+.force:hover,
+.force:active {
+	color: var(--color-main-background);
+	border-color: var(--color-border-error) !important;
+	background: var(--color-error);
+}
+</style>
diff --git a/apps/settings/src/views/AppStoreSidebar.vue b/apps/settings/src/views/AppStoreSidebar.vue
index a25e4e8c693cc..ef1983c476232 100644
--- a/apps/settings/src/views/AppStoreSidebar.vue
+++ b/apps/settings/src/views/AppStoreSidebar.vue
@@ -25,11 +25,16 @@
 		</template>
 
 		<template #description>
-			<!-- Featured/Supported badges -->
-			<div class="app-sidebar__badges">
-				<AppLevelBadge :level="app.level" />
-				<AppDaemonBadge v-if="app.app_api && app.daemon" :daemon="app.daemon" />
-				<AppScore v-if="hasRating" :score="rating" />
+			<div class="app-sidebar__description">
+				<!-- Featured/Supported badges -->
+				<div class="app-sidebar__badges">
+					<AppLevelBadge :level="app.level" />
+					<AppDaemonBadge v-if="app.app_api && app.daemon" :daemon="app.daemon" />
+				</div>
+				<div v-if="hasRating" class="app-sidebar__score">
+					<AppScore :score="rating" />
+				</div>
+				<AppStoreSidebarManageActions :key="app.id" :app="app" />
 			</div>
 		</template>
 
@@ -54,6 +59,7 @@ import AppDeployDaemonTab from '../components/AppStoreSidebar/AppDeployDaemonTab
 import AppDescriptionTab from '../components/AppStoreSidebar/AppDescriptionTab.vue'
 import AppDetailsTab from '../components/AppStoreSidebar/AppDetailsTab.vue'
 import AppReleasesTab from '../components/AppStoreSidebar/AppReleasesTab.vue'
+import AppStoreSidebarManageActions from '../components/AppStoreSidebar/AppStoreSidebarManageActions.vue'
 import { useAppIcon } from '../composables/useAppIcon.ts'
 import { useAppApiStore } from '../store/app-api-store.ts'
 import { useAppsStore } from '../store/apps-store.ts'
@@ -149,12 +155,24 @@ onMounted(loadScreenshot)
 		height: 100%;
 	}
 
+	&__description {
+		display: flex;
+		flex-direction: column;
+		gap: 12px;
+	}
+
 	&__badges {
 		display: flex;
 		flex-direction: row;
+		flex-wrap: wrap;
 		gap: 12px;
 	}
 
+	&__score {
+		display: flex;
+		align-items: center;
+	}
+
 	&__version {
 		color: var(--color-text-maxcontrast);
 	}