diff --git a/dashboard/src/components/app/Storage.vue b/dashboard/src/components/app/Storage.vue
index eff395fb4..2bc9a2f2e 100644
--- a/dashboard/src/components/app/Storage.vue
+++ b/dashboard/src/components/app/Storage.vue
@@ -3,6 +3,7 @@
 import { ref, onMounted, computed } from 'vue';
 import { Button, FormGroup, TextInput, SingleSelect } from '@cloudron/pankow';
 import { prettyBinarySize, prettyDate } from '@cloudron/pankow/utils';
+import { ISTATES } from '../../constants.js';
 import AppsModel from '../../models/AppsModel.js';
 import VolumesModel from '../../models/VolumesModel.js';
 
@@ -159,7 +160,7 @@ onMounted(async () => {
       <p v-html="$t('app.storage.appdata.description', { storagePath: ('/home/yellowtent/appsdata/' + app.id) })"></p>
 
       <form @submit.prevent="onSubmitMove()" autocomplete="off">
-        <fieldset :disabled="moveBusy || app.error || app.taskId">
+        <fieldset :disabled="moveBusy || (app.error && app.error.details.installationState !== ISTATES.PENDING_DATA_DIR_MIGRATION) || app.taskId">
           <input type="submit" style="display: none"/>
 
           <FormGroup>
@@ -179,7 +180,7 @@ onMounted(async () => {
     <div v-if="moveError" class="error-label">{{ moveError }}</div>
     <br/>
 
-    <Button @click="onSubmitMove()" :loading="moveBusy" :disabled="moveBusy || app.error || app.taskId || originalVolumeId === volumeId" v-tooltip="app.error ? 'App is in error state' : (app.taskId ? 'App is busy' : '')">{{ $t('app.storage.appdata.moveAction') }}</Button>
+    <Button @click="onSubmitMove()" :loading="moveBusy" :disabled="moveBusy || (!app.error && originalVolumeId === volumeId) || (app.error && app.error.details.installationState !== ISTATES.PENDING_DATA_DIR_MIGRATION) || app.taskId">{{ $t('app.storage.appdata.moveAction') }}</Button>
 
     <hr style="margin-top: 20px;">
 
@@ -222,7 +223,7 @@ onMounted(async () => {
     </FormGroup>
 
     <br/>
-    <Button @click="onSubmitMounts()" :loading="mountsBusy" :disabled="mountsBusy || app.error || app.taskId || !mountsChanged || !mountsValid" v-tooltip="app.error ? 'App is in error state' : (app.taskId ? 'App is busy' : '')">{{ $t('app.storage.mounts.saveAction') }}</Button>
+    <Button @click="onSubmitMounts()" :loading="mountsBusy" :disabled="mountsBusy || app.error || app.taskId || !mountsChanged || !mountsValid">{{ $t('app.storage.mounts.saveAction') }}</Button>
 
   </div>
 </template>