diff --git a/app/views/oer/market/_searchform.php b/app/views/oer/market/_searchform.php
index 99f76902018d6af9b31cd7fcd8ee8ee9c921786c..474042b6d09e10e07457bfad1d47c32bd1a20b5f 100644
--- a/app/views/oer/market/_searchform.php
+++ b/app/views/oer/market/_searchform.php
@@ -139,7 +139,7 @@
             <h3><?= _('Wertvolle Materialien entdecken!') ?></h3>
             <?= _('Klicken Sie auf die Schlagwörter und entdecken Sie Lernmaterialien zum Thema.') ?>
         </div>
-        <a v-if="tagHistory.length" href="" @click.prevent="backInCloud" class="back-button">
+        <a href="" @click.prevent="backInCloud" class="back-button">
             <studip-icon shape="arr_1left" role="clickable" :size="50"></studip-icon>
         </a>
         <ul class="tags clean">
diff --git a/resources/assets/javascripts/lib/oer.js b/resources/assets/javascripts/lib/oer.js
index b6eb37c4bd86ff42494ec26b116eea8329a8850d..112d155a5ce2c064bfc1698a7cb7eedc67563df7 100644
--- a/resources/assets/javascripts/lib/oer.js
+++ b/resources/assets/javascripts/lib/oer.js
@@ -164,6 +164,10 @@ const OER = {
                         return p;
                     },
                     backInCloud: function () {
+                        if (this.tagHistory.length === 0) {
+                            this.browseMode = false;
+                            return;
+                        }
                         this.tagHistory.pop();
                         let tag_hash = null;
                         let tag_name = null;