diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8d48012cb32..9f589696a6e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,7 +34,8 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 - We fixed an issue with inconsistent capitalization of file extensions when downloading files. [#6115](https://github.com/JabRef/jabref/issues/6115)
 - We fixed the display of language and encoding in the preferences dialog. [#6130](https://github.com/JabRef/jabref/pull/6130)
 - We fixed an issue where search full-text documents downloaded files with same name, overwriting existing files. [#6174](https://github.com/JabRef/jabref/pull/6174)
-- We fixe an issue where custom jstyles for Open/LibreOffice where not saved correctly. [#6170](https://github.com/JabRef/jabref/issues/6170)
+- We fixed an issue where when importing into current library an erroneous message "import cancelled" is displayed even though import is successful. [#6266](https://github.com/JabRef/jabref/issues/6266)
+- We fixed an issue where custom jstyles for Open/LibreOffice where not saved correctly. [#6170](https://github.com/JabRef/jabref/issues/6170)
 
 
 ### Removed
diff --git a/src/main/java/org/jabref/gui/externalfiles/FindUnlinkedFilesDialog.java b/src/main/java/org/jabref/gui/externalfiles/FindUnlinkedFilesDialog.java
index 9c2698126db..66c707e156d 100644
--- a/src/main/java/org/jabref/gui/externalfiles/FindUnlinkedFilesDialog.java
+++ b/src/main/java/org/jabref/gui/externalfiles/FindUnlinkedFilesDialog.java
@@ -60,7 +60,7 @@
 /**
  * GUI Dialog for the feature "Find unlinked files".
  */
-public class FindUnlinkedFilesDialog extends BaseDialog<Void> {
+public class FindUnlinkedFilesDialog extends BaseDialog<Boolean> {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(FindUnlinkedFilesDialog.class);
     private final BibDatabaseContext databaseContext;
@@ -196,7 +196,7 @@ private void initialize() {
                     findUnlinkedFilesTask.cancel();
                 }
             }
-            return null;
+            return false;
         });
 
         new ViewModelTreeCellFactory<FileNodeWrapper>()
diff --git a/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java b/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java
index a24bc091261..a33d5a8c1c0 100644
--- a/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java
+++ b/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java
@@ -44,7 +44,7 @@
 import org.controlsfx.control.CheckListView;
 import org.fxmisc.easybind.EasyBind;
 
-public class ImportEntriesDialog extends BaseDialog<Void> {
+public class ImportEntriesDialog extends BaseDialog<Boolean> {
 
     public CheckListView<BibEntry> entriesListView;
     public ButtonType importButton;
@@ -84,7 +84,7 @@ public ImportEntriesDialog(BibDatabaseContext database, BackgroundTask<ParserRes
                 dialogService.notify(Localization.lang("Import canceled"));
             }
 
-            return null;
+            return false;
         });
     }