diff --git a/src/main/java/org/olat/modules/qpool/ui/QuestionItemDetailsController.java b/src/main/java/org/olat/modules/qpool/ui/QuestionItemDetailsController.java
index 5f04548f68b82d1a1f28435311ff72886e99ccde..4f9f97b3af8519a8b15fe9071b567a6ecaec8464 100644
--- a/src/main/java/org/olat/modules/qpool/ui/QuestionItemDetailsController.java
+++ b/src/main/java/org/olat/modules/qpool/ui/QuestionItemDetailsController.java
@@ -377,20 +377,20 @@ public class QuestionItemDetailsController extends BasicController implements To
 	private void initPrevNextTools() {
 		previousItemLink = LinkFactory.createToolLink("previous", translate("previous"), this);
 		previousItemLink.setIconLeftCSS("o_icon o_icon-fw o_icon_previous");
-		if (numberOfItems <= 1) {
+		if ((itemIndex != null && itemIndex <= 0) || numberOfItems <= 1) {
 			previousItemLink.setEnabled(false);
 		}
 		stackPanel.addTool(previousItemLink);
 		
 		String numbersOf = translate("item.numbers.of", new String[]{
-				itemIndex != null? Integer.toString(itemIndex + 1): "",
+				itemIndex != null? Integer.toString(itemIndex + 1) : "",
 				Integer.toString(numberOfItems) });
 		numberItemsLink = LinkFactory.createToolLink("item.numbers.of", numbersOf, this);
 		stackPanel.addTool(numberItemsLink);
 		
 		nextItemLink = LinkFactory.createToolLink("next", translate("next"), this);
 		nextItemLink.setIconLeftCSS("o_icon io_icon-fw o_icon_next");
-		if (numberOfItems <= 1) {
+		if (itemIndex != null && itemIndex + 1 >= numberOfItems) {
 			nextItemLink.setEnabled(false);
 		}
 		stackPanel.addTool(nextItemLink);