diff --git a/controllers/QuestsController.inc b/controllers/QuestsController.inc
index 9f13848c..51d42cc8 100644
--- a/controllers/QuestsController.inc
+++ b/controllers/QuestsController.inc
@@ -200,11 +200,20 @@
 			
 			// Next Quest/Questgroup
 			$nextQuests = null;
+			$charactedHasChoosenNextQuest = false;
 			$nextQuestgroup = null;
 			if($questtexttypeUrl == 'Epilog' || $solved)
 			{
 				// Next Quest
 				$nextQuests = $this->Quests->getNextQuests($quest['id']);
+				foreach($nextQuests as &$nextQuest)
+				{
+					// Set entered status of Quest
+					$nextQuest['entered'] = $this->Quests->hasCharacterEnteredQuest($nextQuest['id'], $character['id']);
+					if($nextQuest['entered']) {
+						$charactedHasChoosenNextQuest = true;
+					}
+				}
 				
 				// Next Questgroup
 				if(empty($nextQuests))
@@ -233,6 +242,7 @@
 			$this->set('queststatustext', $questStatusText);
 			$this->set('relatedquesttext', $relatedQuesttext);
 			$this->set('nextquests', $nextQuests);
+			$this->set('charactedHasChoosenNextQuest', $charactedHasChoosenNextQuest);
 			$this->set('nextquestgroup', $nextQuestgroup);
 			$this->set('task', $task);
 			$this->set('media', $questmedia);
diff --git a/views/html/quests/quest.tpl b/views/html/quests/quest.tpl
index 9f736e0b..3d440d50 100644
--- a/views/html/quests/quest.tpl
+++ b/views/html/quests/quest.tpl
@@ -63,9 +63,23 @@
 	<ul>
 		<?php foreach($nextquests as &$nextquest) : ?>
 		<?php if($nextquest['id'] == $relatedquesttext['quest']['id']) : ?>
-		<li><?=_('Quest')?>: <a href="<?=$linker->link(array($nextquest['questgroup_url'],$nextquest['url'],$relatedquesttext['type_url'],$relatedquesttext['pos']),3)?>"><?=$nextquest['title']?></a></li>
+		<li>
+			<?=_('Quest')?>:
+			<?php if($nextquest['entered'] || !$charactedHasChoosenNextQuest) : ?>
+			<a href="<?=$linker->link(array($nextquest['questgroup_url'],$nextquest['url'],$relatedquesttext['type_url'],$relatedquesttext['pos']),3)?>"><?=$nextquest['title']?></a>
+			<?php else : ?>
+			<?=$nextquest['title']?>
+			<?php endif ?>
+		</li>
 		<?php else : ?>
-		<li><?=_('Quest')?>: <a href="<?=$linker->link(array($nextquest['questgroup_url'],$nextquest['url']),3)?>"><?=$nextquest['title']?></a></li>
+		<li>
+			<?=_('Quest')?>:
+			<?php if($nextquest['entered'] || !$charactedHasChoosenNextQuest) : ?>
+			<a href="<?=$linker->link(array($nextquest['questgroup_url'],$nextquest['url']),3)?>"><?=$nextquest['title']?></a>
+			<?php else : ?>
+			<?=$nextquest['title']?>
+			<?php endif ?>
+		</li>
 		<?php endif ?>
 		<?php endforeach ?>
 	</ul>