diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
index 355a301d40c..baca17aabdd 100644
--- a/src/main/java/org/jabref/gui/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -752,7 +752,11 @@ private boolean closeTabs() {
     }
 
     public boolean closeCurrentTab() {
-        return closeTab(getCurrentLibraryTab());
+        LibraryTab currentTab = getCurrentLibraryTab();
+        if (currentTab == null) {
+            return false;
+        }
+        return closeTab(currentTab);
     }
 
     public OpenDatabaseAction getOpenDatabaseAction() {