diff --git a/Source/stores.cpp b/Source/stores.cpp
index 0517d6d1d..e09f7c645 100644
--- a/Source/stores.cpp
+++ b/Source/stores.cpp
@@ -1159,15 +1159,19 @@ void StartStorytellerIdentify()
 		}
 	}
 
-	if (!idok) {
-		HasScrollbar = false;
-
-		RenderGold = true;
-		AddSText(20, 1, _("You have nothing to identify."), UiFlags::ColorWhitegold, false);
-		AddSLine(3);
-		AddItemListBackButton(/*selectable=*/true);
-		return;
-	}
+	if (!idok) {
+		HasScrollbar = false;
+
+		RenderGold = true;
+		if (OldActiveStore == TalkID::StorytellerIdentifyAll) {
+			AddSText(20, 1, _("There are no items to identify."), UiFlags::ColorWhitegold, false);
+		} else {
+			AddSText(20, 1, _("You have nothing to identify."), UiFlags::ColorWhitegold, false);
+		}
+		AddSLine(3);
+		AddItemListBackButton(/*selectable=*/true);
+		return;
+	}
 
 	HasScrollbar = true;
 	ScrollPos = 0;
@@ -1919,13 +1923,13 @@ void StorytellerEnter()
 	}
 }
 
-void StorytellerIdentifyEnter()
-{
-	if (CurrentTextLine == BackButtonLine()) {
-		StartStore(TalkID::Storyteller);
-		CurrentTextLine = 14;
-		return;
-	}
+void StorytellerIdentifyEnter()
+{
+	if (CurrentTextLine == BackButtonLine()) {
+		StartStore(TalkID::Storyteller);
+		CurrentTextLine = OldActiveStore == TalkID::StorytellerIdentifyAll ? 16 : 14;
+		return;
+	}
 
 	OldActiveStore = TalkID::StorytellerIdentify;
 	OldTextLine = CurrentTextLine;