diff --git a/CHANGELOG.md b/CHANGELOG.md
index de4f00f3f07..2e628a0b6a5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,7 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
 - We added "Close library" to the File menu. [#14381](https://github.com/JabRef/jabref/issues/14381)
 - We added a "Regenerate" button for the AI chat allowing the user to make the language model reformulate its response to the previous prompt. [#12191](https://github.com/JabRef/jabref/issues/12191)
 - We added support for transliteration of fields to English and automatic transliteration of generated citation key. [#11377](https://github.com/JabRef/jabref/issues/11377)
+- We added the generation of follow-up questions in AI chat. [#12243](https://github.com/JabRef/jabref/issues/12243)
 - We added support for "Search Google Scholar" and "Search Semantic Scholar" to quickly search for a selected entry's title in Google Scholar or Semantic Scholar directly from the main table's context menu [#12268](https://github.com/JabRef/jabref/issues/12268)
 - We introduced a new "Search Engine URL Template" setting in Preferences to allow users to customize their search engine URL templates [#12268](https://github.com/JabRef/jabref/issues/12268)
 
diff --git a/jabgui/src/main/java/org/jabref/gui/ai/components/aichat/AiChatComponent.java b/jabgui/src/main/java/org/jabref/gui/ai/components/aichat/AiChatComponent.java
index ea518de18ae..11f35c44172 100644
--- a/jabgui/src/main/java/org/jabref/gui/ai/components/aichat/AiChatComponent.java
+++ b/jabgui/src/main/java/org/jabref/gui/ai/components/aichat/AiChatComponent.java
@@ -15,6 +15,7 @@
 import javafx.scene.control.Button;
 import javafx.scene.control.Hyperlink;
 import javafx.scene.control.Label;
+import javafx.scene.control.Tooltip;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.VBox;
 import javafx.scene.paint.Color;
@@ -78,6 +79,7 @@ public class AiChatComponent extends VBox {
     @FXML private Hyperlink exQuestion2;
     @FXML private Hyperlink exQuestion3;
     @FXML private HBox exQuestionBox;
+    @FXML private HBox followUpQuestionsBox;
 
     private String noticeTemplate;
 
@@ -114,6 +116,7 @@ public void initialize() {
         initializeNotifications();
         sendExampleQuestions();
         initializeExampleQuestions();
+        initializeFollowUpQuestions();
     }
 
     private void initializeNotifications() {
@@ -214,6 +217,42 @@ private void initializeChatPrompt() {
         updatePromptHistory();
     }
 
+    private void initializeFollowUpQuestions() {
+        aiChatLogic.getFollowUpQuestions().addListener((javafx.collections.ListChangeListener<String>) change -> {
+            updateFollowUpQuestions();
+        });
+    }
+
+    private void updateFollowUpQuestions() {
+        List<String> questions = new ArrayList<>(aiChatLogic.getFollowUpQuestions());
+
+        UiTaskExecutor.runInJavaFXThread(() -> {
+            followUpQuestionsBox.getChildren().removeIf(node -> node instanceof Hyperlink);
+
+            if (questions.isEmpty()) {
+                followUpQuestionsBox.setVisible(false);
+                followUpQuestionsBox.setManaged(false);
+                exQuestionBox.setVisible(true);
+                exQuestionBox.setManaged(true);
+            } else {
+                followUpQuestionsBox.setVisible(true);
+                followUpQuestionsBox.setManaged(true);
+                exQuestionBox.setVisible(false);
+                exQuestionBox.setManaged(false);
+
+                for (String question : questions) {
+                    Hyperlink link = new Hyperlink(question);
+                    link.getStyleClass().add("exampleQuestionStyle");
+                    link.setTooltip(new Tooltip(question));
+                    link.setOnAction(event -> {
+                        onSendMessage(question);
+                    });
+                    followUpQuestionsBox.getChildren().add(link);
+                }
+            }
+        });
+    }
+
     private void updateNotifications() {
         notifications.clear();
         notifications.addAll(entries.stream().map(this::updateNotificationsForEntry).flatMap(List::stream).toList());
@@ -278,6 +317,13 @@ private List<Notification> updateNotificationsForEntry(BibEntry entry) {
     }
 
     private void onSendMessage(String userPrompt) {
+        aiChatLogic.getFollowUpQuestions().clear();
+
+        UiTaskExecutor.runInJavaFXThread(() -> {
+            exQuestionBox.setVisible(false);
+            exQuestionBox.setManaged(false);
+        });
+
         UserMessage userMessage = new UserMessage(userPrompt);
         updatePromptHistory();
         setLoading(true);
diff --git a/jabgui/src/main/java/org/jabref/gui/cleanup/CleanupDialogViewModel.java b/jabgui/src/main/java/org/jabref/gui/cleanup/CleanupDialogViewModel.java
index 5da5cb8ccba..50aaee237bf 100644
--- a/jabgui/src/main/java/org/jabref/gui/cleanup/CleanupDialogViewModel.java
+++ b/jabgui/src/main/java/org/jabref/gui/cleanup/CleanupDialogViewModel.java
@@ -198,4 +198,3 @@ private void showFailures(List<JabRefException> failures) {
         );
     }
 }
-
diff --git a/jabgui/src/main/java/org/jabref/gui/preferences/ai/AiTab.java b/jabgui/src/main/java/org/jabref/gui/preferences/ai/AiTab.java
index 1f708435c3f..1a461280411 100644
--- a/jabgui/src/main/java/org/jabref/gui/preferences/ai/AiTab.java
+++ b/jabgui/src/main/java/org/jabref/gui/preferences/ai/AiTab.java
@@ -9,6 +9,8 @@
 import javafx.scene.control.Button;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.ComboBox;
+import javafx.scene.control.Label;
+import javafx.scene.control.Spinner;
 import javafx.scene.control.Tab;
 import javafx.scene.control.TabPane;
 import javafx.scene.control.TextArea;
@@ -40,6 +42,11 @@ public class AiTab extends AbstractPreferenceTabView<AiTabViewModel> implements
     @FXML private CheckBox enableAi;
     @FXML private CheckBox autoGenerateEmbeddings;
     @FXML private CheckBox autoGenerateSummaries;
+    @FXML private CheckBox generateFollowUpQuestions;
+    @FXML private Spinner<Integer> followUpQuestionsCountSpinner;
+    @FXML private Tab followUpQuestionsTab;
+    @FXML private TextArea followUpQuestionsTextArea;
+    @FXML private Label followUpQuestionsCountLabel;
 
     @FXML private ComboBox<AiProvider> aiProviderComboBox;
     @FXML private ComboBox<String> chatModelComboBox;
@@ -117,7 +124,7 @@ private void initializeTemplates() {
         summarizationCombineUserMessageTextArea.textProperty().bindBidirectional(viewModel.getTemplateSources().get(AiTemplate.SUMMARIZATION_COMBINE_USER_MESSAGE));
         citationParsingSystemMessageTextArea.textProperty().bindBidirectional(viewModel.getTemplateSources().get(AiTemplate.CITATION_PARSING_SYSTEM_MESSAGE));
         citationParsingUserMessageTextArea.textProperty().bindBidirectional(viewModel.getTemplateSources().get(AiTemplate.CITATION_PARSING_USER_MESSAGE));
-
+        followUpQuestionsTextArea.textProperty().bindBidirectional(viewModel.getTemplateSources().get(AiTemplate.FOLLOW_UP_QUESTIONS));
         templatesTabPane.getSelectionModel().selectedItemProperty().addListener(_ -> viewModel.selectedTemplateProperty().set(getAiTemplate()));
     }
 
@@ -248,6 +255,11 @@ private void initializeEnableAi() {
         autoGenerateSummaries.disableProperty().bind(viewModel.disableAutoGenerateSummaries());
         autoGenerateEmbeddings.selectedProperty().bindBidirectional(viewModel.autoGenerateEmbeddings());
         autoGenerateEmbeddings.disableProperty().bind(viewModel.disableAutoGenerateEmbeddings());
+        generateFollowUpQuestions.selectedProperty().bindBidirectional(viewModel.generateFollowUpQuestions());
+        followUpQuestionsCountSpinner.setValueFactory(AiTabViewModel.followUpQuestionsCountValueFactory);
+        followUpQuestionsCountSpinner.getValueFactory().valueProperty().bindBidirectional(viewModel.followUpQuestionsCountProperty().asObject());
+        followUpQuestionsCountSpinner.disableProperty().bind(generateFollowUpQuestions.selectedProperty().not());
+        followUpQuestionsCountLabel.disableProperty().bind(generateFollowUpQuestions.selectedProperty().not());
     }
 
     @Override
@@ -292,6 +304,8 @@ public Optional<AiTemplate> getAiTemplate() {
             return Optional.of(AiTemplate.CITATION_PARSING_SYSTEM_MESSAGE);
         } else if (selectedTab == citationParsingUserMessageTab) {
             return Optional.of(AiTemplate.CITATION_PARSING_USER_MESSAGE);
+        } else if (selectedTab == followUpQuestionsTab) {
+            return Optional.of(AiTemplate.FOLLOW_UP_QUESTIONS);
         }
 
         return Optional.empty();
diff --git a/jabgui/src/main/java/org/jabref/gui/preferences/ai/AiTabViewModel.java b/jabgui/src/main/java/org/jabref/gui/preferences/ai/AiTabViewModel.java
index c6308a77f29..0015c74f78c 100644
--- a/jabgui/src/main/java/org/jabref/gui/preferences/ai/AiTabViewModel.java
+++ b/jabgui/src/main/java/org/jabref/gui/preferences/ai/AiTabViewModel.java
@@ -18,6 +18,7 @@
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.collections.FXCollections;
+import javafx.scene.control.SpinnerValueFactory;
 
 import org.jabref.gui.preferences.PreferenceTabViewModel;
 import org.jabref.logic.ai.AiDefaultPreferences;
@@ -37,6 +38,8 @@
 import de.saxsys.mvvmfx.utils.validation.Validator;
 
 public class AiTabViewModel implements PreferenceTabViewModel {
+    protected static SpinnerValueFactory<Integer> followUpQuestionsCountValueFactory = new SpinnerValueFactory.IntegerSpinnerValueFactory(1, 5, 3);
+
     private final Locale oldLocale;
 
     private final BooleanProperty enableAi = new SimpleBooleanProperty();
@@ -44,6 +47,8 @@ public class AiTabViewModel implements PreferenceTabViewModel {
     private final BooleanProperty disableAutoGenerateEmbeddings = new SimpleBooleanProperty();
     private final BooleanProperty autoGenerateSummaries = new SimpleBooleanProperty();
     private final BooleanProperty disableAutoGenerateSummaries = new SimpleBooleanProperty();
+    private final BooleanProperty generateFollowUpQuestions = new SimpleBooleanProperty();
+    private final IntegerProperty followUpQuestionsCount = new SimpleIntegerProperty();
 
     private final ListProperty<AiProvider> aiProvidersList =
             new SimpleListProperty<>(FXCollections.observableArrayList(AiProvider.values()));
@@ -91,7 +96,8 @@ AiTemplate.SUMMARIZATION_CHUNK_USER_MESSAGE, new SimpleStringProperty(),
             AiTemplate.SUMMARIZATION_COMBINE_SYSTEM_MESSAGE, new SimpleStringProperty(),
             AiTemplate.SUMMARIZATION_COMBINE_USER_MESSAGE, new SimpleStringProperty(),
             AiTemplate.CITATION_PARSING_SYSTEM_MESSAGE, new SimpleStringProperty(),
-            AiTemplate.CITATION_PARSING_USER_MESSAGE, new SimpleStringProperty()
+            AiTemplate.CITATION_PARSING_USER_MESSAGE, new SimpleStringProperty(),
+            AiTemplate.FOLLOW_UP_QUESTIONS, new SimpleStringProperty()
     );
 
     private final OptionalObjectProperty<AiTemplate> selectedTemplate = OptionalObjectProperty.empty();
@@ -341,6 +347,8 @@ public void setValues() {
         enableAi.setValue(aiPreferences.getEnableAi());
         autoGenerateSummaries.setValue(aiPreferences.getAutoGenerateSummaries());
         autoGenerateEmbeddings.setValue(aiPreferences.getAutoGenerateEmbeddings());
+        generateFollowUpQuestions.setValue(aiPreferences.getGenerateFollowUpQuestions());
+        followUpQuestionsCount.setValue(aiPreferences.getFollowUpQuestionsCount());
 
         selectedAiProvider.setValue(aiPreferences.getAiProvider());
 
@@ -364,6 +372,8 @@ public void storeSettings() {
         aiPreferences.setEnableAi(enableAi.get());
         aiPreferences.setAutoGenerateEmbeddings(autoGenerateEmbeddings.get());
         aiPreferences.setAutoGenerateSummaries(autoGenerateSummaries.get());
+        aiPreferences.setGenerateFollowUpQuestions(generateFollowUpQuestions.get());
+        aiPreferences.setFollowUpQuestionsCount(followUpQuestionsCount.get());
 
         aiPreferences.setAiProvider(selectedAiProvider.get());
 
@@ -414,6 +424,7 @@ public void resetExpertSettings() {
         documentSplitterOverlapSize.set(AiDefaultPreferences.DOCUMENT_SPLITTER_OVERLAP);
         ragMaxResultsCount.set(AiDefaultPreferences.RAG_MAX_RESULTS_COUNT);
         ragMinScore.set(LocalizedNumbers.doubleToString(AiDefaultPreferences.RAG_MIN_SCORE));
+        followUpQuestionsCount.set(AiDefaultPreferences.FOLLOW_UP_QUESTIONS_COUNT);
     }
 
     public void resetTemplates() {
@@ -487,6 +498,18 @@ public BooleanProperty disableAutoGenerateSummaries() {
         return disableAutoGenerateSummaries;
     }
 
+    public BooleanProperty generateFollowUpQuestions() {
+        return generateFollowUpQuestions;
+    }
+
+    public IntegerProperty followUpQuestionsCountProperty() {
+        return followUpQuestionsCount;
+    }
+
+    public StringProperty followUpQuestionsTemplateProperty() {
+        return aiPreferences.templateProperty(AiTemplate.FOLLOW_UP_QUESTIONS);
+    }
+
     public ReadOnlyListProperty<AiProvider> aiProvidersProperty() {
         return aiProvidersList;
     }
diff --git a/jabgui/src/main/resources/org/jabref/gui/ai/components/aichat/AiChatComponent.fxml b/jabgui/src/main/resources/org/jabref/gui/ai/components/aichat/AiChatComponent.fxml
index 49a9123084a..2753d758937 100644
--- a/jabgui/src/main/resources/org/jabref/gui/ai/components/aichat/AiChatComponent.fxml
+++ b/jabgui/src/main/resources/org/jabref/gui/ai/components/aichat/AiChatComponent.fxml
@@ -25,12 +25,16 @@
     </Loadable>
 
     <HBox spacing="10" alignment="CENTER" fx:id="exQuestionBox">
-        <Label text="%Try with examples" BorderPane.alignment="CENTER"/>
+        <Label text="%Try with examples:" BorderPane.alignment="CENTER"/>
         <Hyperlink fx:id="exQuestion1" BorderPane.alignment="CENTER" styleClass="exampleQuestionStyle"/>
         <Hyperlink fx:id="exQuestion2" BorderPane.alignment="CENTER" styleClass="exampleQuestionStyle"/>
         <Hyperlink fx:id="exQuestion3" BorderPane.alignment="CENTER" styleClass="exampleQuestionStyle"/>
     </HBox>
 
+    <HBox spacing="10" alignment="CENTER" fx:id="followUpQuestionsBox" managed="false" visible="false">
+        <Label text="%Follow-up questions:" BorderPane.alignment="CENTER"/>
+    </HBox>
+
     <HBox spacing="10">
         <Button alignment="CENTER"
                 fx:id="notificationsButton"
diff --git a/jabgui/src/main/resources/org/jabref/gui/preferences/ai/AiTab.fxml b/jabgui/src/main/resources/org/jabref/gui/preferences/ai/AiTab.fxml
index d32fe92c2ce..09804a8ab74 100644
--- a/jabgui/src/main/resources/org/jabref/gui/preferences/ai/AiTab.fxml
+++ b/jabgui/src/main/resources/org/jabref/gui/preferences/ai/AiTab.fxml
@@ -5,6 +5,7 @@
 <?import javafx.scene.control.CheckBox?>
 <?import javafx.scene.control.ComboBox?>
 <?import javafx.scene.control.Label?>
+<?import javafx.scene.control.Spinner?>
 <?import javafx.scene.control.Tab?>
 <?import javafx.scene.control.TabPane?>
 <?import javafx.scene.control.TextArea?>
@@ -21,6 +22,7 @@
 <?import javafx.scene.layout.Region?>
 <?import com.dlsc.gemsfx.Spacer?>
 <?import javafx.scene.layout.Pane?>
+<?import com.sun.javafx.scene.control.IntegerField?>
 <fx:root
         spacing="10.0"
         type="VBox"
@@ -296,6 +298,11 @@
              closable="false">
             <TextArea fx:id="citationParsingUserMessageTextArea"/>
         </Tab>
+        <Tab fx:id="followUpQuestionsTab"
+             text="%Prompt for generating follow-up questions"
+             closable="false">
+             <TextArea fx:id="followUpQuestionsTextArea"/>
+        </Tab>
     </TabPane>
 
     <HBox spacing="10" alignment="CENTER_LEFT">
@@ -330,4 +337,23 @@
               text="%Automatically generate summaries for new entries"
               HBox.hgrow="ALWAYS"
               maxWidth="Infinity"/>
+
+    <CheckBox fx:id="generateFollowUpQuestions"
+              mnemonicParsing="false"
+              text="%Generate follow-up questions"
+              HBox.hgrow="ALWAYS"
+              maxWidth="Infinity"/>
+
+    <HBox alignment="CENTER_LEFT" spacing="10.0">
+        <padding>
+            <Insets left="20.0"/>
+        </padding>
+        <Label fx:id="followUpQuestionsCountLabel"
+               alignment="BASELINE_CENTER"
+               text="%Number of follow-up questions"/>
+        <Spinner fx:id="followUpQuestionsCountSpinner"
+                 editable="true"
+                 maxWidth="100"/>
+    </HBox>
+
 </fx:root>
diff --git a/jablib/src/main/java/org/jabref/logic/ai/AiDefaultPreferences.java b/jablib/src/main/java/org/jabref/logic/ai/AiDefaultPreferences.java
index 1acbdf3eed2..5fbda94040d 100644
--- a/jablib/src/main/java/org/jabref/logic/ai/AiDefaultPreferences.java
+++ b/jablib/src/main/java/org/jabref/logic/ai/AiDefaultPreferences.java
@@ -58,6 +58,8 @@ public String toString() {
     public static final boolean ENABLE_CHAT = false;
     public static final boolean AUTO_GENERATE_EMBEDDINGS = false;
     public static final boolean AUTO_GENERATE_SUMMARIES = false;
+    public static final boolean GENERATE_FOLLOW_UP_QUESTIONS = true;
+    public static final int FOLLOW_UP_QUESTIONS_COUNT = 3;
 
     public static final AiProvider PROVIDER = AiProvider.OPEN_AI;
 
@@ -115,7 +117,20 @@ public String toString() {
             AiTemplate.SUMMARIZATION_COMBINE_USER_MESSAGE, "$chunks",
 
             AiTemplate.CITATION_PARSING_SYSTEM_MESSAGE, "You are a bot to convert a plain text citation to a BibTeX entry. The user you talk to understands only BibTeX code, so provide it plainly without any wrappings.",
-            AiTemplate.CITATION_PARSING_USER_MESSAGE, "Please convert this plain text citation to a BibTeX entry:\n$citation\nIn your output, please provide only BibTeX code as your message."
+            AiTemplate.CITATION_PARSING_USER_MESSAGE, "Please convert this plain text citation to a BibTeX entry:\n$citation\nIn your output, please provide only BibTeX code as your message.",
+
+            AiTemplate.FOLLOW_UP_QUESTIONS, """
+                    Based on this conversation:
+                    User: $userMessage
+                    Assistant: $aiResponse
+
+                    Generate $count short follow-up questions (maximum 10 words each) that the user might want to ask next.
+                    Format your response as a numbered list:
+                    1. [question]
+                    2. [question]
+                    3. [question]
+
+                    Only provide the numbered list, nothing else."""
     );
 
     public static List<String> getAvailableModels(AiProvider aiProvider) {
diff --git a/jablib/src/main/java/org/jabref/logic/ai/AiPreferences.java b/jablib/src/main/java/org/jabref/logic/ai/AiPreferences.java
index 9356407be71..c3a20df8e29 100644
--- a/jablib/src/main/java/org/jabref/logic/ai/AiPreferences.java
+++ b/jablib/src/main/java/org/jabref/logic/ai/AiPreferences.java
@@ -35,6 +35,8 @@ public class AiPreferences {
     private final BooleanProperty enableAi;
     private final BooleanProperty autoGenerateEmbeddings;
     private final BooleanProperty autoGenerateSummaries;
+    private final BooleanProperty generateFollowUpQuestions;
+    private final IntegerProperty followUpQuestionsCount;
 
     private final ObjectProperty<AiProvider> aiProvider;
 
@@ -67,6 +69,8 @@ public class AiPreferences {
     public AiPreferences(boolean enableAi,
                          boolean autoGenerateEmbeddings,
                          boolean autoGenerateSummaries,
+                         boolean generateFollowUpQuestions,
+                         int followUpQuestionsCount,
                          AiProvider aiProvider,
                          String openAiChatModel,
                          String mistralAiChatModel,
@@ -91,6 +95,8 @@ public AiPreferences(boolean enableAi,
         this.enableAi = new SimpleBooleanProperty(enableAi);
         this.autoGenerateEmbeddings = new SimpleBooleanProperty(autoGenerateEmbeddings);
         this.autoGenerateSummaries = new SimpleBooleanProperty(autoGenerateSummaries);
+        this.generateFollowUpQuestions = new SimpleBooleanProperty(generateFollowUpQuestions);
+        this.followUpQuestionsCount = new SimpleIntegerProperty(followUpQuestionsCount);
 
         this.aiProvider = new SimpleObjectProperty<>(aiProvider);
 
@@ -127,7 +133,8 @@ AiTemplate.SUMMARIZATION_CHUNK_USER_MESSAGE, new SimpleStringProperty(templates.
                 AiTemplate.SUMMARIZATION_COMBINE_SYSTEM_MESSAGE, new SimpleStringProperty(templates.get(AiTemplate.SUMMARIZATION_COMBINE_SYSTEM_MESSAGE)),
                 AiTemplate.SUMMARIZATION_COMBINE_USER_MESSAGE, new SimpleStringProperty(templates.get(AiTemplate.SUMMARIZATION_COMBINE_USER_MESSAGE)),
                 AiTemplate.CITATION_PARSING_SYSTEM_MESSAGE, new SimpleStringProperty(templates.get(AiTemplate.CITATION_PARSING_SYSTEM_MESSAGE)),
-                AiTemplate.CITATION_PARSING_USER_MESSAGE, new SimpleStringProperty(templates.get(AiTemplate.CITATION_PARSING_USER_MESSAGE))
+                AiTemplate.CITATION_PARSING_USER_MESSAGE, new SimpleStringProperty(templates.get(AiTemplate.CITATION_PARSING_USER_MESSAGE)),
+                AiTemplate.FOLLOW_UP_QUESTIONS, new SimpleStringProperty(templates.get(AiTemplate.FOLLOW_UP_QUESTIONS))
         );
     }
 
@@ -195,6 +202,30 @@ public void setAutoGenerateSummaries(boolean autoGenerateSummaries) {
         this.autoGenerateSummaries.set(autoGenerateSummaries);
     }
 
+    public BooleanProperty generateFollowUpQuestionsProperty() {
+        return generateFollowUpQuestions;
+    }
+
+    public IntegerProperty followUpQuestionsCountProperty() {
+        return followUpQuestionsCount;
+    }
+
+    public int getFollowUpQuestionsCount() {
+        return followUpQuestionsCount.get();
+    }
+
+    public void setFollowUpQuestionsCount(int followUpQuestionsCount) {
+        this.followUpQuestionsCount.set(followUpQuestionsCount);
+    }
+
+    public boolean getGenerateFollowUpQuestions() {
+        return generateFollowUpQuestions.get();
+    }
+
+    public void setGenerateFollowUpQuestions(boolean generateFollowUpQuestions) {
+        this.generateFollowUpQuestions.set(generateFollowUpQuestions);
+    }
+
     public ObjectProperty<AiProvider> aiProviderProperty() {
         return aiProvider;
     }
diff --git a/jablib/src/main/java/org/jabref/logic/ai/chatting/AiChatLogic.java b/jablib/src/main/java/org/jabref/logic/ai/chatting/AiChatLogic.java
index 128dd442cf5..e3ff6cddbd2 100644
--- a/jablib/src/main/java/org/jabref/logic/ai/chatting/AiChatLogic.java
+++ b/jablib/src/main/java/org/jabref/logic/ai/chatting/AiChatLogic.java
@@ -4,6 +4,7 @@
 import java.util.Optional;
 
 import javafx.beans.property.StringProperty;
+import javafx.collections.FXCollections;
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
 
@@ -46,7 +47,9 @@ public class AiChatLogic {
     private final EmbeddingModel embeddingModel;
     private final EmbeddingStore<TextSegment> embeddingStore;
     private final AiTemplatesService aiTemplatesService;
+    private final FollowUpQuestionGenerator followUpQuestionGenerator;
 
+    private final ObservableList<String> followUpQuestions = FXCollections.observableArrayList();
     private final ObservableList<ChatMessage> chatHistory;
     private final ObservableList<BibEntry> entries;
     private final StringProperty name;
@@ -61,6 +64,7 @@ public AiChatLogic(AiPreferences aiPreferences,
                        EmbeddingModel embeddingModel,
                        EmbeddingStore<TextSegment> embeddingStore,
                        AiTemplatesService aiTemplatesService,
+                       FollowUpQuestionGenerator followUpQuestionGenerator,
                        StringProperty name,
                        ObservableList<ChatMessage> chatHistory,
                        ObservableList<BibEntry> entries,
@@ -71,6 +75,7 @@ public AiChatLogic(AiPreferences aiPreferences,
         this.embeddingModel = embeddingModel;
         this.embeddingStore = embeddingStore;
         this.aiTemplatesService = aiTemplatesService;
+        this.followUpQuestionGenerator = followUpQuestionGenerator;
         this.chatHistory = chatHistory;
         this.entries = entries;
         this.name = name;
@@ -191,6 +196,18 @@ public AiMessage execute(UserMessage message) {
 
         LOGGER.debug("Message was answered by the AI provider for {}: {}", name.get(), aiMessage.text());
 
+        if (aiPreferences.getGenerateFollowUpQuestions()) {
+            try {
+                List<String> questions = followUpQuestionGenerator.generateFollowUpQuestions(message, aiMessage);
+                followUpQuestions.setAll(questions);
+            } catch (Exception e) {
+                LOGGER.warn("Failed to generate follow-up questions", e);
+                followUpQuestions.clear();
+            }
+        } else {
+            followUpQuestions.clear();
+        }
+
         return aiMessage;
     }
 
@@ -205,4 +222,8 @@ private Optional<BibEntry> findEntryByLink(String link) {
     public ObservableList<ChatMessage> getChatHistory() {
         return chatHistory;
     }
+
+    public ObservableList<String> getFollowUpQuestions() {
+        return followUpQuestions;
+    }
 }
diff --git a/jablib/src/main/java/org/jabref/logic/ai/chatting/AiChatService.java b/jablib/src/main/java/org/jabref/logic/ai/chatting/AiChatService.java
index 5506fe4a975..97742cccdf1 100644
--- a/jablib/src/main/java/org/jabref/logic/ai/chatting/AiChatService.java
+++ b/jablib/src/main/java/org/jabref/logic/ai/chatting/AiChatService.java
@@ -40,12 +40,17 @@ public AiChatLogic makeChat(
             ObservableList<BibEntry> entries,
             BibDatabaseContext bibDatabaseContext
     ) {
+        FollowUpQuestionGenerator followUpQuestionGenerator = new FollowUpQuestionGenerator(
+                chatLanguageModel,
+                aiTemplatesService,
+                aiPreferences);
         return new AiChatLogic(
                 aiPreferences,
                 chatLanguageModel,
                 embeddingModel,
                 embeddingStore,
                 aiTemplatesService,
+                followUpQuestionGenerator,
                 name,
                 chatHistory,
                 entries,
diff --git a/jablib/src/main/java/org/jabref/logic/ai/chatting/FollowUpQuestionGenerator.java b/jablib/src/main/java/org/jabref/logic/ai/chatting/FollowUpQuestionGenerator.java
new file mode 100644
index 00000000000..3e366766d79
--- /dev/null
+++ b/jablib/src/main/java/org/jabref/logic/ai/chatting/FollowUpQuestionGenerator.java
@@ -0,0 +1,110 @@
+package org.jabref.logic.ai.chatting;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.jabref.logic.ai.AiPreferences;
+import org.jabref.logic.ai.templates.AiTemplatesService;
+
+import dev.langchain4j.data.message.AiMessage;
+import dev.langchain4j.data.message.UserMessage;
+import dev.langchain4j.model.chat.ChatModel;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class FollowUpQuestionGenerator {
+    private static final Logger LOGGER = LoggerFactory.getLogger(FollowUpQuestionGenerator.class);
+    private static final int MIN_QUESTION_LENGTH = 5;
+    private static final int MAX_QUESTION_LENGTH = 100;
+
+    private final ChatModel chatLanguageModel;
+    private final AiTemplatesService aiTemplatesService;
+    private final AiPreferences aiPreferences;
+
+    public FollowUpQuestionGenerator(ChatModel chatLanguageModel, AiTemplatesService aiTemplatesService, AiPreferences aiPreferences) {
+        this.chatLanguageModel = chatLanguageModel;
+        this.aiTemplatesService = aiTemplatesService;
+        this.aiPreferences = aiPreferences;
+    }
+
+    public List<String> generateFollowUpQuestions(UserMessage userMessage, AiMessage aiMessage) {
+        try {
+            String prompt = buildPrompt(userMessage.singleText(), aiMessage.text());
+
+            LOGGER.debug("Generating follow-up questions for conversation");
+
+            AiMessage response = chatLanguageModel.chat(List.of(new UserMessage(prompt))).aiMessage();
+            String responseText = response.text();
+
+            LOGGER.debug("Received follow-up questions response: {}", responseText);
+
+            List<String> questions = parseQuestions(responseText);
+
+            LOGGER.info("Generated {} follow-up questions", questions.size());
+
+            return questions;
+        } catch (Exception e) {
+            LOGGER.warn("Failed to generate follow-up questions", e);
+            return new ArrayList<>();
+        }
+    }
+
+    private String buildPrompt(String userMessage, String aiResponse) {
+        return aiTemplatesService.makeFollowUpQuestionsPrompt(userMessage, aiResponse, aiPreferences.getFollowUpQuestionsCount());
+    }
+
+    private List<String> parseQuestions(String response) {
+        List<String> questions = new ArrayList<>();
+
+        Pattern numberedPattern = Pattern.compile("^\\s*\\d+\\.\\s*(.+)$", Pattern.MULTILINE);
+        Matcher matcher = numberedPattern.matcher(response);
+
+        while (matcher.find() && questions.size() < aiPreferences.getFollowUpQuestionsCount()) {
+            String question = matcher.group(1).trim();
+
+            question = question.replaceAll("^[\"']|[\"']$", "");
+
+            if (isValidQuestion(question)) {
+                questions.add(question);
+            }
+        }
+
+        if (questions.isEmpty()) {
+            LOGGER.debug("Numbered format parsing failed, trying line-by-line parsing");
+            String[] lines = response.split("\n");
+
+            for (String line : lines) {
+                if (questions.size() >= aiPreferences.getFollowUpQuestionsCount()) {
+                    break;
+                }
+
+                line = line.trim()
+                           .replaceAll("^[-*•]\\s*", "")
+                           .replaceAll("^\\d+\\.\\s*", "")
+                           .replaceAll("^[\"']|[\"']$", "");
+
+                if (isValidQuestion(line)) {
+                    questions.add(line);
+                }
+            }
+        }
+
+        return questions;
+    }
+
+    private boolean isValidQuestion(String question) {
+        if (question == null || question.isBlank()) {
+            return false;
+        }
+
+        int length = question.length();
+        if (length < MIN_QUESTION_LENGTH || length > MAX_QUESTION_LENGTH) {
+            LOGGER.debug("Question length {} is outside valid range [{}, {}]", length, MIN_QUESTION_LENGTH, MAX_QUESTION_LENGTH);
+            return false;
+        }
+
+        return true;
+    }
+}
diff --git a/jablib/src/main/java/org/jabref/logic/ai/templates/AiTemplate.java b/jablib/src/main/java/org/jabref/logic/ai/templates/AiTemplate.java
index d7d0665d20b..00b07addd29 100644
--- a/jablib/src/main/java/org/jabref/logic/ai/templates/AiTemplate.java
+++ b/jablib/src/main/java/org/jabref/logic/ai/templates/AiTemplate.java
@@ -17,7 +17,10 @@ public enum AiTemplate {
 
     // Templates that are used to convert a raw citation into a {@link BibEntry}.
     CITATION_PARSING_SYSTEM_MESSAGE,
-    CITATION_PARSING_USER_MESSAGE;
+    CITATION_PARSING_USER_MESSAGE,
+
+    // Template that is used to generate follow-up questions in chat.
+    FOLLOW_UP_QUESTIONS;
 
     public String getLocalizedName() {
         return switch (this) {
@@ -37,6 +40,8 @@ public String getLocalizedName() {
                     Localization.lang("System message for citation parsing");
             case CITATION_PARSING_USER_MESSAGE ->
                     Localization.lang("User message for citation parsing");
+            case FOLLOW_UP_QUESTIONS ->
+                    Localization.lang("Prompt for generating follow-up questions");
         };
     }
 }
diff --git a/jablib/src/main/java/org/jabref/logic/ai/templates/AiTemplatesService.java b/jablib/src/main/java/org/jabref/logic/ai/templates/AiTemplatesService.java
index 3ad8b570a99..80191d293a0 100644
--- a/jablib/src/main/java/org/jabref/logic/ai/templates/AiTemplatesService.java
+++ b/jablib/src/main/java/org/jabref/logic/ai/templates/AiTemplatesService.java
@@ -76,6 +76,15 @@ public String makeCitationParsingUserMessage(String citation) {
         return makeTemplate(AiTemplate.CITATION_PARSING_USER_MESSAGE, context);
     }
 
+    public String makeFollowUpQuestionsPrompt(String userMessage, String aiResponse, int count) {
+        VelocityContext context = new VelocityContext(baseContext);
+        context.put("userMessage", userMessage);
+        context.put("aiResponse", aiResponse);
+        context.put("count", count);
+
+        return makeTemplate(AiTemplate.FOLLOW_UP_QUESTIONS, context);
+    }
+
     private String makeTemplate(AiTemplate template, VelocityContext context) {
         StringWriter writer = new StringWriter();
 
diff --git a/jablib/src/main/java/org/jabref/logic/preferences/JabRefCliPreferences.java b/jablib/src/main/java/org/jabref/logic/preferences/JabRefCliPreferences.java
index 7f79b6d9b57..1f99cd6e574 100644
--- a/jablib/src/main/java/org/jabref/logic/preferences/JabRefCliPreferences.java
+++ b/jablib/src/main/java/org/jabref/logic/preferences/JabRefCliPreferences.java
@@ -379,6 +379,9 @@ public class JabRefCliPreferences implements CliPreferences {
     private static final String AI_ENABLED = "aiEnabled";
     private static final String AI_AUTO_GENERATE_EMBEDDINGS = "aiAutoGenerateEmbeddings";
     private static final String AI_AUTO_GENERATE_SUMMARIES = "aiAutoGenerateSummaries";
+    private static final String AI_GENERATE_FOLLOW_UP_QUESTIONS = "aiGenerateFollowUpQuestions";
+    private static final String AI_FOLLOW_UP_QUESTIONS_COUNT = "aiFollowUpQuestionsCount";
+    private static final String AI_FOLLOW_UP_QUESTIONS_TEMPLATE = "aiFollowUpQuestionsTemplate";
     private static final String AI_PROVIDER = "aiProvider";
     private static final String AI_OPEN_AI_CHAT_MODEL = "aiOpenAiChatModel";
     private static final String AI_MISTRAL_AI_CHAT_MODEL = "aiMistralAiChatModel";
@@ -728,6 +731,9 @@ public JabRefCliPreferences() {
         defaults.put(AI_ENABLED, AiDefaultPreferences.ENABLE_CHAT);
         defaults.put(AI_AUTO_GENERATE_EMBEDDINGS, AiDefaultPreferences.AUTO_GENERATE_EMBEDDINGS);
         defaults.put(AI_AUTO_GENERATE_SUMMARIES, AiDefaultPreferences.AUTO_GENERATE_SUMMARIES);
+        defaults.put(AI_GENERATE_FOLLOW_UP_QUESTIONS, AiDefaultPreferences.GENERATE_FOLLOW_UP_QUESTIONS);
+        defaults.put(AI_FOLLOW_UP_QUESTIONS_COUNT, AiDefaultPreferences.FOLLOW_UP_QUESTIONS_COUNT);
+        defaults.put(AI_FOLLOW_UP_QUESTIONS_TEMPLATE, AiDefaultPreferences.TEMPLATES.get(AiTemplate.FOLLOW_UP_QUESTIONS));
         defaults.put(AI_PROVIDER, AiDefaultPreferences.PROVIDER.name());
         defaults.put(AI_OPEN_AI_CHAT_MODEL, AiDefaultPreferences.CHAT_MODELS.get(AiProvider.OPEN_AI).getName());
         defaults.put(AI_MISTRAL_AI_CHAT_MODEL, AiDefaultPreferences.CHAT_MODELS.get(AiProvider.MISTRAL_AI).getName());
@@ -2027,6 +2033,8 @@ public AiPreferences getAiPreferences() {
                 aiEnabled,
                 getBoolean(AI_AUTO_GENERATE_EMBEDDINGS),
                 getBoolean(AI_AUTO_GENERATE_SUMMARIES),
+                getBoolean(AI_GENERATE_FOLLOW_UP_QUESTIONS),
+                getInt(AI_FOLLOW_UP_QUESTIONS_COUNT),
                 AiProvider.valueOf(get(AI_PROVIDER)),
                 get(AI_OPEN_AI_CHAT_MODEL),
                 get(AI_MISTRAL_AI_CHAT_MODEL),
@@ -2054,12 +2062,15 @@ AiTemplate.SUMMARIZATION_CHUNK_USER_MESSAGE, get(AI_SUMMARIZATION_CHUNK_USER_MES
                         AiTemplate.SUMMARIZATION_COMBINE_SYSTEM_MESSAGE, get(AI_SUMMARIZATION_COMBINE_SYSTEM_MESSAGE_TEMPLATE),
                         AiTemplate.SUMMARIZATION_COMBINE_USER_MESSAGE, get(AI_SUMMARIZATION_COMBINE_USER_MESSAGE_TEMPLATE),
                         AiTemplate.CITATION_PARSING_SYSTEM_MESSAGE, get(AI_CITATION_PARSING_SYSTEM_MESSAGE_TEMPLATE),
-                        AiTemplate.CITATION_PARSING_USER_MESSAGE, get(AI_CITATION_PARSING_USER_MESSAGE_TEMPLATE)
+                        AiTemplate.CITATION_PARSING_USER_MESSAGE, get(AI_CITATION_PARSING_USER_MESSAGE_TEMPLATE),
+                        AiTemplate.FOLLOW_UP_QUESTIONS, get(AI_FOLLOW_UP_QUESTIONS_TEMPLATE)
                 ));
 
         EasyBind.listen(aiPreferences.enableAiProperty(), (_, _, newValue) -> putBoolean(AI_ENABLED, newValue));
         EasyBind.listen(aiPreferences.autoGenerateEmbeddingsProperty(), (_, _, newValue) -> putBoolean(AI_AUTO_GENERATE_EMBEDDINGS, newValue));
         EasyBind.listen(aiPreferences.autoGenerateSummariesProperty(), (_, _, newValue) -> putBoolean(AI_AUTO_GENERATE_SUMMARIES, newValue));
+        EasyBind.listen(aiPreferences.generateFollowUpQuestionsProperty(), (_, _, newValue) -> putBoolean(AI_GENERATE_FOLLOW_UP_QUESTIONS, newValue));
+        EasyBind.listen(aiPreferences.followUpQuestionsCountProperty(), (_, _, newValue) -> putInt(AI_FOLLOW_UP_QUESTIONS_COUNT, newValue));
 
         EasyBind.listen(aiPreferences.aiProviderProperty(), (_, _, newValue) -> put(AI_PROVIDER, newValue.name()));
 
@@ -2093,6 +2104,7 @@ AiTemplate.CITATION_PARSING_USER_MESSAGE, get(AI_CITATION_PARSING_USER_MESSAGE_T
         EasyBind.listen(aiPreferences.templateProperty(AiTemplate.SUMMARIZATION_COMBINE_USER_MESSAGE), (_, _, newValue) -> put(AI_SUMMARIZATION_COMBINE_USER_MESSAGE_TEMPLATE, newValue));
         EasyBind.listen(aiPreferences.templateProperty(AiTemplate.CITATION_PARSING_SYSTEM_MESSAGE), (_, _, newValue) -> put(AI_CITATION_PARSING_SYSTEM_MESSAGE_TEMPLATE, newValue));
         EasyBind.listen(aiPreferences.templateProperty(AiTemplate.CITATION_PARSING_USER_MESSAGE), (_, _, newValue) -> put(AI_CITATION_PARSING_USER_MESSAGE_TEMPLATE, newValue));
+        EasyBind.listen(aiPreferences.templateProperty(AiTemplate.FOLLOW_UP_QUESTIONS), (_, _, newValue) -> put(AI_FOLLOW_UP_QUESTIONS_TEMPLATE, newValue));
 
         return aiPreferences;
     }
diff --git a/jablib/src/main/resources/l10n/JabRef_en.properties b/jablib/src/main/resources/l10n/JabRef_en.properties
index 49bac18a8d5..eb07c5860bb 100644
--- a/jablib/src/main/resources/l10n/JabRef_en.properties
+++ b/jablib/src/main/resources/l10n/JabRef_en.properties
@@ -2774,6 +2774,10 @@ RAG\ minimum\ score\ must\ be\ greater\ than\ 0\ and\ less\ than\ 1=RAG minimum
 Temperature\ must\ be\ a\ number=Temperature must be a number
 Automatically\ generate\ embeddings\ for\ new\ entries=Automatically generate embeddings for new entries
 Automatically\ generate\ summaries\ for\ new\ entries=Automatically generate summaries for new entries
+Generate\ follow-up\ questions=Generate follow-up questions
+Number\ of\ follow-up\ questions=Number of follow-up questions
+Prompt\ for\ generating\ follow-up\ questions=Prompt for generating follow-up questions
+Follow-up\ questions\:=Follow-up questions:
 Connection=Connection
 Generate\ embeddings\ for\ linked\ files\ in\ the\ group=Generate embeddings for linked files in the group
 Generate\ summaries\ for\ entries\ in\ the\ group=Generate summaries for entries in the group
@@ -2792,7 +2796,7 @@ User\ message\ for\ parsing\ raw\ citations=User message for parsing raw citatio
 User\ message\ for\ summarization\ of\ a\ chunk=User message for summarization of a chunk
 User\ message\ for\ summarization\ of\ several\ chunks=User message for summarization of several chunks
 User\ message\ for\ chatting=User message for chatting
-Try\ with\ examples=Try with examples
+Try\ with\ examples\:=Try with examples:
 What\ is\ the\ goal\ of\ the\ paper?=What is the goal of the paper?
 Which\ methods\ were\ used\ in\ the\ research?=Which methods were used in the research?
 What\ are\ the\ key\ findings?=What are the key findings?