diff --git a/app/templates/corpora/corpus_public.html.j2 b/app/templates/corpora/corpus_public.html.j2
index 86356b87..f35c66e6 100644
--- a/app/templates/corpora/corpus_public.html.j2
+++ b/app/templates/corpora/corpus_public.html.j2
@@ -10,7 +10,6 @@
       <h1>{{ title }} </h1>
       <div class="row">
         <div class="col s8 m9 l10">
-          {% if not corpus.user == current_user %}
           <a class="btn waves-effect waves-light" id="follow-corpus-request">
             {% if current_user.is_following_corpus(corpus) %}
             <i class="material-icons left">add</i>Unfollow Corpus
@@ -18,6 +17,8 @@
             <i class="material-icons left">add</i>Follow Corpus
             {% endif %}
           </a>
+          {% if corpus.status.name in ['BUILT', 'STARTING_ANALYSIS_SESSION', 'RUNNING_ANALYSIS_SESSION', 'CANCELING_ANALYSIS_SESSION'] and current_user.is_following_corpus(corpus) %}
+          <a class="btn waves-effect waves-light" href="{{ url_for('corpora.analyse_corpus', corpus_id=corpus.id) }}">Analyse</a>
           {% endif %}
         </div>
       </div>