diff --git a/app/views/file/choose_destination.php b/app/views/file/choose_destination.php
index fa5e73d6e4ff08938c0d2fd09efa39677621da8c..7247439062b097fd6cdc0ed2081ab1e595c91b64 100644
--- a/app/views/file/choose_destination.php
+++ b/app/views/file/choose_destination.php
@@ -30,10 +30,10 @@ $options = array_filter([
         <div>
         <? if (isset($parent_folder) && ($parent_folder->isWritable($GLOBALS['user']->id) || count($parent_folder->getSubfolders()))): ?>
             <div class="clickable">
-                <?= Icon::create('folder-parent', Icon::ROLE_CLICKABLE)->asInput(50, ['formaction' => $controller->action_url('choose_folder/' . $parent_folder->getId()), 'to_plugin' => $options['from_plugin']]) ?>
+                <?= Icon::create('folder-parent', Icon::ROLE_CLICKABLE)->asInput(50, ['formaction' => $controller->action_url('choose_folder/' . $parent_folder->getId()), 'to_plugin' => $options['from_plugin'] ?? null]) ?>
                 <button
                     class="undecorated"
-                    formaction="<?= $controller->action_link('choose_folder/' . $parent_folder->getId()) ?>" <? if ($options['from_plugin']): ?> name="to_plugin" value="<?= htmlReady($options['from_plugin']) ?>"<? endif; ?>>
+                    formaction="<?= $controller->action_link('choose_folder/' . $parent_folder->getId()) ?>" <? if ($options['from_plugin']): ?> name="to_plugin" value="<?= htmlReady($options['from_plugin'] ?? null) ?>"<? endif; ?>>
                     <?= _('Aktueller Ordner') ?>
                 </button>
             </div>
diff --git a/app/views/file/edit.php b/app/views/file/edit.php
index 3e36abb312a20995cfb0dc3e44c0de0a1f073fc5..803b312e1ece99dbbfb88d90f0a0541768b88d45 100644
--- a/app/views/file/edit.php
+++ b/app/views/file/edit.php
@@ -3,7 +3,7 @@
 
     <div id="file_management_forms">
         <form method="post" data-dialog class="default"
-            action="<?= $controller->action_link('edit/' . $file_ref->id, ['from_plugin' => $from_plugin]) ?>">
+            action="<?= $controller->action_link('edit/' . $file_ref->id, ['from_plugin' => $from_plugin ?? null]) ?>">
 
             <?= CSRFProtection::tokenTag() ?>
             <fieldset>