diff --git a/web/app/static/js/nopaque/displays/CorpusDisplay.js b/web/app/static/js/nopaque/displays/CorpusDisplay.js
index fb98e2bc..2050ed49 100644
--- a/web/app/static/js/nopaque/displays/CorpusDisplay.js
+++ b/web/app/static/js/nopaque/displays/CorpusDisplay.js
@@ -47,17 +47,24 @@ class CorpusDisplay extends RessourceDisplay {
   }
 
   setStatus(status) {
-    for (let element of this.displayElement.querySelectorAll('.corpus-status')) {this.setElement(element, status);}
-    for (let element of this.displayElement.querySelectorAll('.status')) {element.dataset.status = status;}
-    for (let element of this.displayElement.querySelectorAll('.status-spinner')) {
-      if (['complete', 'failed', 'unprepared'].includes(status)) {
-        element.classList.add('hide');
+    for (let element of this.displayElement.querySelectorAll('.analyse-corpus-trigger')) {
+      if (['analysing', 'prepared', 'start analysis'].includes(status)) {
+        element.classList.remove('disabled');
       } else {
-        element.classList.remove('hide');
+        element.classList.add('disabled');
       }
     }
     for (let element of this.displayElement.querySelectorAll('.build-corpus-trigger')) {
-      if (['complete', 'failed'].includes(status)) {
+      if (status === 'unprepared') {
+        element.classList.remove('disabled');
+      } else {
+        element.classList.add('disabled');
+      }
+    }
+    for (let element of this.displayElement.querySelectorAll('.corpus-status')) {this.setElement(element, status);}
+    for (let element of this.displayElement.querySelectorAll('.status')) {element.dataset.status = status;}
+    for (let element of this.displayElement.querySelectorAll('.status-spinner')) {
+      if (['submitted', 'queued', 'running', 'canceling', 'start analysis', 'stop analysis'].includes(status)) {
         element.classList.remove('hide');
       } else {
         element.classList.add('hide');
diff --git a/web/app/templates/corpora/corpus.html.j2 b/web/app/templates/corpora/corpus.html.j2
index c6695603..7c1d5730 100644
--- a/web/app/templates/corpora/corpus.html.j2
+++ b/web/app/templates/corpora/corpus.html.j2
@@ -70,8 +70,8 @@
           </div>
         </div>
         <div class="card-action right-align">
-          <a class="btn disabled hide waves-effect waves-light" href="{{ url_for('corpora.analyse_corpus', corpus_id=corpus.id) }}"><i class="material-icons left">search</i>Analyze</a>
-          <a class="btn disabled hide waves-effect waves-light" href="{{ url_for('corpora.prepare_corpus', corpus_id=corpus.id) }}"><i class="material-icons left">build</i>Build</a>
+          <a class="analyse-corpus-trigger btn disabled waves-effect waves-light" href="{{ url_for('corpora.analyse_corpus', corpus_id=corpus.id) }}"><i class="material-icons left">search</i>Analyze</a>
+          <a class="btn build-corpus-trigger disabled waves-effect waves-light" href="{{ url_for('corpora.prepare_corpus', corpus_id=corpus.id) }}"><i class="material-icons left">build</i>Build</a>
           <a class="btn hide waves-effect waves-light" id="corpus-export"><i class="material-icons left">import_export</i>Export Corpus</a>
           <a class="btn modal-trigger red waves-effect waves-light" data-target="delete-corpus-modal"><i class="material-icons left">delete</i>Delete</a>
         </div>