diff --git a/.idea/runConfigurations/JabRef_Main.xml b/.idea/runConfigurations/JabRef_Main.xml
index 7099a883e17..048f2dd8126 100644
--- a/.idea/runConfigurations/JabRef_Main.xml
+++ b/.idea/runConfigurations/JabRef_Main.xml
@@ -1,7 +1,5 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="JabRef Main" type="Application" factoryName="Application" singleton="false">
-    <option name="ALTERNATIVE_JRE_PATH" value="11" />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
     <option name="MAIN_CLASS_NAME" value="org.jabref.JabRefMain" />
     <module name="JabRef.main" />
     <option name="VM_PARAMETERS" value="--patch-module test=fastparse_2.12-1.0.0.jar --patch-module test2=fastparse-utils_2.12-1.0.0.jar --patch-module test3=sourcecode_2.12-0.1.4.jar --patch-module org.jabref=build/resources/main --add-exports javafx.controls/com.sun.javafx.scene.control=org.jabref --add-exports org.controlsfx.controls/impl.org.controlsfx.skin=org.jabref --add-opens javafx.controls/javafx.scene.control=org.jabref --add-opens org.controlsfx.controls/org.controlsfx.control.textfield=org.jabref --add-exports javafx.graphics/com.sun.javafx.scene=org.controlsfx.controls --add-exports javafx.graphics/com.sun.javafx.scene.traversal=org.controlsfx.controls --add-exports javafx.graphics/com.sun.javafx.css=org.controlsfx.controls --add-exports javafx.controls/com.sun.javafx.scene.control.behavior=org.controlsfx.controls --add-exports javafx.controls/com.sun.javafx.scene.control=org.controlsfx.controls --add-exports javafx.controls/com.sun.javafx.scene.control.inputmap=org.controlsfx.controls --add-exports javafx.base/com.sun.javafx.event=org.controlsfx.controls --add-exports javafx.base/com.sun.javafx.collections=org.controlsfx.controls --add-exports javafx.base/com.sun.javafx.runtime=org.controlsfx.controls --add-exports javafx.web/com.sun.webkit=org.controlsfx.controls --add-exports javafx.graphics/com.sun.javafx.css=org.controlsfx.controls --add-opens javafx.controls/javafx.scene.control.skin=org.controlsfx.controls --add-opens javafx.graphics/javafx.scene=org.controlsfx.controls" />
@@ -11,4 +9,4 @@
       <option name="Make" enabled="true" />
     </method>
   </configuration>
-</component>
\ No newline at end of file
+</component>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4436b5ab901..7979b1a365d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 
 - We added a short DOI field formatter which shortens DOI to more human-readable form. [koppor#343](https://github.com/koppor/jabref/issues/343)
 - We improved the display of group memberships by adding multiple colored bars if the entry belongs to more than one group. [#4574](https://github.com/JabRef/jabref/issues/4574)
+- We added an option to show the preview as an extra tab in the entry editor (instead of in a split view). [#5244](https://github.com/JabRef/jabref/issues/5244)
 
 ### Fixed
 
diff --git a/src/main/java/org/jabref/gui/BasePanel.java b/src/main/java/org/jabref/gui/BasePanel.java
index 4f4f6b2417c..fc5c9ed8d59 100644
--- a/src/main/java/org/jabref/gui/BasePanel.java
+++ b/src/main/java/org/jabref/gui/BasePanel.java
@@ -676,7 +676,7 @@ private void createMainTable() {
         String clearSearch = "clearSearch";
         mainTable.getInputMap().put(Globals.getKeyPrefs().getKey(KeyBinding.CLEAR_SEARCH), clearSearch);
         mainTable.getActionMap().put(clearSearch, new AbstractAction() {
-        
+
             @Override
             public void actionPerformed(ActionEvent e) {
                 // need to close these here, b/c this action overshadows the responsible actions when the main table is selected
@@ -697,9 +697,9 @@ public void actionPerformed(ActionEvent e) {
                 }
             }
         });
-        
+
         mainTable.getActionMap().put(Actions.CUT, new AbstractAction() {
-        
+
             @Override
             public void actionPerformed(ActionEvent e) {
                 try {
@@ -710,7 +710,7 @@ public void actionPerformed(ActionEvent e) {
             }
         });
         mainTable.getActionMap().put(Actions.COPY, new AbstractAction() {
-        
+
             @Override
             public void actionPerformed(ActionEvent e) {
                 try {
@@ -721,7 +721,7 @@ public void actionPerformed(ActionEvent e) {
             }
         });
         mainTable.getActionMap().put(Actions.PASTE, new AbstractAction() {
-        
+
             @Override
             public void actionPerformed(ActionEvent e) {
                 try {
@@ -749,10 +749,8 @@ public void setupMainPanel() {
         splitPane.getItems().add(pane);
 
         // Set up name autocompleter for search:
-        executorService.execute(() -> {
-            instantiateSearchAutoCompleter();
-            setupAutoCompletion();
-        });
+        setupAutoCompletion();
+        executorService.execute(this::instantiateSearchAutoCompleter);
         this.getDatabase().registerListener(new SearchAutoCompleteListener());
 
         // Saves the divider position as soon as it changes
diff --git a/src/main/java/org/jabref/gui/entryeditor/DeprecatedFieldsTab.java b/src/main/java/org/jabref/gui/entryeditor/DeprecatedFieldsTab.java
index a6be86e5b8d..c3b7b224a40 100644
--- a/src/main/java/org/jabref/gui/entryeditor/DeprecatedFieldsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/DeprecatedFieldsTab.java
@@ -11,19 +11,27 @@
 
 import javafx.scene.control.Tooltip;
 
-import org.jabref.Globals;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.autocompleter.SuggestionProviders;
+import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.icon.IconTheme;
+import org.jabref.gui.util.TaskExecutor;
+import org.jabref.logic.journals.JournalAbbreviationLoader;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.BibEntryType;
+import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.entry.field.Field;
+import org.jabref.preferences.JabRefPreferences;
 
 public class DeprecatedFieldsTab extends FieldsEditorTab {
-    public DeprecatedFieldsTab(BibDatabaseContext databaseContext, SuggestionProviders suggestionProviders, UndoManager undoManager, DialogService dialogService) {
-        super(false, databaseContext, suggestionProviders, undoManager, dialogService);
+
+    private final BibEntryTypesManager entryTypesManager;
+
+    public DeprecatedFieldsTab(BibDatabaseContext databaseContext, SuggestionProviders suggestionProviders, UndoManager undoManager, DialogService dialogService, JabRefPreferences preferences, BibEntryTypesManager entryTypesManager, ExternalFileTypes externalFileTypes, TaskExecutor taskExecutor, JournalAbbreviationLoader journalAbbreviationLoader) {
+        super(false, databaseContext, suggestionProviders, undoManager, dialogService, preferences, externalFileTypes, taskExecutor, journalAbbreviationLoader);
+        this.entryTypesManager = entryTypesManager;
 
         setText(Localization.lang("Deprecated fields"));
         setTooltip(new Tooltip(Localization.lang("Show deprecated BibTeX fields")));
@@ -32,7 +40,7 @@ public DeprecatedFieldsTab(BibDatabaseContext databaseContext, SuggestionProvide
 
     @Override
     protected SortedSet<Field> determineFieldsToShow(BibEntry entry) {
-        Optional<BibEntryType> entryType = Globals.entryTypesManager.enrich(entry.getType(), databaseContext.getMode());
+        Optional<BibEntryType> entryType = entryTypesManager.enrich(entry.getType(), databaseContext.getMode());
         if (entryType.isPresent()) {
             return entryType.get().getDeprecatedFields()
                             .stream()
diff --git a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
index 9bd2a2a9c4c..02efa83d935 100644
--- a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
+++ b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
@@ -25,6 +25,7 @@
 import javafx.scene.input.TransferMode;
 import javafx.scene.layout.BorderPane;
 
+import org.jabref.Globals;
 import org.jabref.gui.BasePanel;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.GUIGlobals;
@@ -262,22 +263,23 @@ private void navigateToNextEntry() {
     }
 
     private List<EntryEditorTab> createTabs() {
+        // Preview tab
+        entryEditorTabs.add(new PreviewTab(databaseContext, dialogService, Globals.prefs, ExternalFileTypes.getInstance()));
 
         // Required fields
-        entryEditorTabs.add(new RequiredFieldsTab(databaseContext, panel.getSuggestionProviders(), undoManager, dialogService));
+        entryEditorTabs.add(new RequiredFieldsTab(databaseContext, panel.getSuggestionProviders(), undoManager, dialogService, Globals.prefs, Globals.entryTypesManager, ExternalFileTypes.getInstance(), Globals.TASK_EXECUTOR, Globals.journalAbbreviationLoader));
 
         // Optional fields
-        entryEditorTabs.add(new OptionalFieldsTab(databaseContext, panel.getSuggestionProviders(), undoManager, dialogService));
-        entryEditorTabs.add(new OptionalFields2Tab(databaseContext, panel.getSuggestionProviders(), undoManager, dialogService));
-        entryEditorTabs.add(new DeprecatedFieldsTab(databaseContext, panel.getSuggestionProviders(), undoManager, dialogService));
+        entryEditorTabs.add(new OptionalFieldsTab(databaseContext, panel.getSuggestionProviders(), undoManager, dialogService, Globals.prefs, Globals.entryTypesManager, ExternalFileTypes.getInstance(), Globals.TASK_EXECUTOR, Globals.journalAbbreviationLoader));
+        entryEditorTabs.add(new OptionalFields2Tab(databaseContext, panel.getSuggestionProviders(), undoManager, dialogService, Globals.prefs, Globals.entryTypesManager, ExternalFileTypes.getInstance(), Globals.TASK_EXECUTOR, Globals.journalAbbreviationLoader));
+        entryEditorTabs.add(new DeprecatedFieldsTab(databaseContext, panel.getSuggestionProviders(), undoManager, dialogService, Globals.prefs, Globals.entryTypesManager, ExternalFileTypes.getInstance(), Globals.TASK_EXECUTOR, Globals.journalAbbreviationLoader));
 
         // Other fields
-        entryEditorTabs.add(new OtherFieldsTab(databaseContext, panel.getSuggestionProviders(), undoManager,
-                entryEditorPreferences.getCustomTabFieldNames(), dialogService));
+        entryEditorTabs.add(new OtherFieldsTab(databaseContext, panel.getSuggestionProviders(), undoManager, entryEditorPreferences.getCustomTabFieldNames(), dialogService, Globals.prefs, Globals.entryTypesManager, ExternalFileTypes.getInstance(), Globals.TASK_EXECUTOR, Globals.journalAbbreviationLoader));
 
         // General fields from preferences
         for (Map.Entry<String, Set<Field>> tab : entryEditorPreferences.getEntryEditorTabList().entrySet()) {
-            entryEditorTabs.add(new UserDefinedFieldsTab(tab.getKey(), tab.getValue(), databaseContext, panel.getSuggestionProviders(), undoManager, dialogService));
+            entryEditorTabs.add(new UserDefinedFieldsTab(tab.getKey(), tab.getValue(), databaseContext, panel.getSuggestionProviders(), undoManager, dialogService, Globals.prefs, Globals.entryTypesManager, ExternalFileTypes.getInstance(), Globals.TASK_EXECUTOR, Globals.journalAbbreviationLoader));
         }
 
         // Special tabs
diff --git a/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java b/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
index ec62128dbc2..603450b39ce 100644
--- a/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
@@ -5,6 +5,7 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.SortedSet;
 import java.util.stream.Stream;
 
@@ -22,7 +23,6 @@
 import javafx.scene.layout.Region;
 import javafx.scene.layout.RowConstraints;
 
-import org.jabref.Globals;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.autocompleter.SuggestionProviders;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
@@ -30,9 +30,12 @@
 import org.jabref.gui.fieldeditors.FieldEditors;
 import org.jabref.gui.fieldeditors.FieldNameLabel;
 import org.jabref.gui.preview.PreviewPanel;
+import org.jabref.gui.util.TaskExecutor;
+import org.jabref.logic.journals.JournalAbbreviationLoader;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
+import org.jabref.preferences.JabRefPreferences;
 
 /**
  * A single tab displayed in the EntryEditor holding several FieldEditors.
@@ -43,17 +46,25 @@ abstract class FieldsEditorTab extends EntryEditorTab {
     private final boolean isCompressed;
     private final SuggestionProviders suggestionProviders;
     private final DialogService dialogService;
+    private final JabRefPreferences preferences;
+    private final ExternalFileTypes externalFileTypes;
+    private final TaskExecutor taskExecutor;
+    private final JournalAbbreviationLoader journalAbbreviationLoader;
     private PreviewPanel previewPanel;
     private UndoManager undoManager;
     private Collection<Field> fields = new ArrayList<>();
     private GridPane gridPane;
 
-    public FieldsEditorTab(boolean compressed, BibDatabaseContext databaseContext, SuggestionProviders suggestionProviders, UndoManager undoManager, DialogService dialogService) {
+    public FieldsEditorTab(boolean compressed, BibDatabaseContext databaseContext, SuggestionProviders suggestionProviders, UndoManager undoManager, DialogService dialogService, JabRefPreferences preferences, ExternalFileTypes externalFileTypes, TaskExecutor taskExecutor, JournalAbbreviationLoader journalAbbreviationLoader) {
         this.isCompressed = compressed;
-        this.databaseContext = databaseContext;
-        this.suggestionProviders = suggestionProviders;
-        this.undoManager = undoManager;
-        this.dialogService = dialogService;
+        this.databaseContext = Objects.requireNonNull(databaseContext);
+        this.suggestionProviders = Objects.requireNonNull(suggestionProviders);
+        this.undoManager = Objects.requireNonNull(undoManager);
+        this.dialogService = Objects.requireNonNull(dialogService);
+        this.preferences = Objects.requireNonNull(preferences);
+        this.externalFileTypes = Objects.requireNonNull(externalFileTypes);
+        this.taskExecutor = Objects.requireNonNull(taskExecutor);
+        this.journalAbbreviationLoader = Objects.requireNonNull(journalAbbreviationLoader);
     }
 
     private static void addColumn(GridPane gridPane, int columnIndex, List<Label> nodes) {
@@ -64,10 +75,10 @@ private static void addColumn(GridPane gridPane, int columnIndex, Stream<Parent>
         gridPane.addColumn(columnIndex, nodes.toArray(Node[]::new));
     }
 
-    private void setupPanel(BibEntry entry, boolean compressed, SuggestionProviders suggestionProviders, UndoManager undoManager) {
+    private void setupPanel(BibEntry entry, boolean compressed) {
         // The preferences might be not initialized in tests -> return immediately
         // TODO: Replace this ugly workaround by proper injection propagation
-        if (Globals.prefs == null) {
+        if (preferences == null) {
             return;
         }
 
@@ -80,9 +91,9 @@ private void setupPanel(BibEntry entry, boolean compressed, SuggestionProviders
 
         List<Label> labels = new ArrayList<>();
         for (Field field : fields) {
-            FieldEditorFX fieldEditor = FieldEditors.getForField(field, Globals.TASK_EXECUTOR, dialogService,
-                    Globals.journalAbbreviationLoader.getRepository(Globals.prefs.getJournalAbbreviationPreferences()),
-                    Globals.prefs, databaseContext, entry.getType(), suggestionProviders, undoManager);
+            FieldEditorFX fieldEditor = FieldEditors.getForField(field, taskExecutor, dialogService,
+                    journalAbbreviationLoader.getRepository(preferences.getJournalAbbreviationPreferences()),
+                    preferences, databaseContext, entry.getType(), suggestionProviders, undoManager);
             fieldEditor.bindToEntry(entry);
 
             editors.put(field, fieldEditor);
@@ -164,19 +175,25 @@ public boolean shouldShow(BibEntry entry) {
     @Override
     protected void bindToEntry(BibEntry entry) {
         initPanel();
-        setupPanel(entry, isCompressed, suggestionProviders, undoManager);
+        setupPanel(entry, isCompressed);
 
-        previewPanel.setEntry(entry);
+        if (previewPanel != null) {
+            previewPanel.setEntry(entry);
+        }
     }
 
     @Override
     protected void nextPreviewStyle() {
-        previewPanel.nextPreviewStyle();
+        if (previewPanel != null) {
+            previewPanel.nextPreviewStyle();
+        }
     }
 
     @Override
     protected void previousPreviewStyle() {
-        previewPanel.previousPreviewStyle();
+        if (previewPanel != null) {
+            previewPanel.previousPreviewStyle();
+        }
     }
 
     protected abstract SortedSet<Field> determineFieldsToShow(BibEntry entry);
@@ -190,8 +207,6 @@ private void initPanel() {
             gridPane = new GridPane();
             gridPane.getStyleClass().add("editorPane");
 
-            previewPanel = new PreviewPanel(databaseContext, dialogService, ExternalFileTypes.getInstance(), Globals.getKeyPrefs(), Globals.prefs);
-
             // Warp everything in a scroll-pane
             ScrollPane scrollPane = new ScrollPane();
             scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.NEVER);
@@ -200,7 +215,11 @@ private void initPanel() {
             scrollPane.setFitToWidth(true);
             scrollPane.setFitToHeight(true);
 
-            SplitPane container = new SplitPane(scrollPane, previewPanel);
+            SplitPane container = new SplitPane(scrollPane);
+            if (!preferences.getPreviewPreferences().showPreviewAsExtraTab()) {
+                previewPanel = new PreviewPanel(databaseContext, dialogService, externalFileTypes, preferences.getKeyBindingRepository(), preferences);
+                container.getItems().add(previewPanel);
+            }
 
             setContent(container);
         }
diff --git a/src/main/java/org/jabref/gui/entryeditor/OptionalFields2Tab.java b/src/main/java/org/jabref/gui/entryeditor/OptionalFields2Tab.java
index 13305dad0b4..7553bc46496 100644
--- a/src/main/java/org/jabref/gui/entryeditor/OptionalFields2Tab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/OptionalFields2Tab.java
@@ -8,19 +8,27 @@
 
 import javafx.scene.control.Tooltip;
 
-import org.jabref.Globals;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.autocompleter.SuggestionProviders;
+import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.icon.IconTheme;
+import org.jabref.gui.util.TaskExecutor;
+import org.jabref.logic.journals.JournalAbbreviationLoader;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.BibEntryType;
+import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.entry.field.Field;
+import org.jabref.preferences.JabRefPreferences;
 
 public class OptionalFields2Tab extends FieldsEditorTab {
-    public OptionalFields2Tab(BibDatabaseContext databaseContext, SuggestionProviders suggestionProviders, UndoManager undoManager, DialogService dialogService) {
-        super(true, databaseContext, suggestionProviders, undoManager, dialogService);
+
+    private final BibEntryTypesManager entryTypesManager;
+
+    public OptionalFields2Tab(BibDatabaseContext databaseContext, SuggestionProviders suggestionProviders, UndoManager undoManager, DialogService dialogService, JabRefPreferences preferences, BibEntryTypesManager entryTypesManager, ExternalFileTypes externalFileTypes, TaskExecutor taskExecutor, JournalAbbreviationLoader journalAbbreviationLoader) {
+        super(true, databaseContext, suggestionProviders, undoManager, dialogService, preferences, externalFileTypes, taskExecutor, journalAbbreviationLoader);
+        this.entryTypesManager = entryTypesManager;
 
         setText(Localization.lang("Optional fields 2"));
         setTooltip(new Tooltip(Localization.lang("Show optional fields")));
@@ -29,7 +37,7 @@ public OptionalFields2Tab(BibDatabaseContext databaseContext, SuggestionProvider
 
     @Override
     protected SortedSet<Field> determineFieldsToShow(BibEntry entry) {
-        Optional<BibEntryType> entryType = Globals.entryTypesManager.enrich(entry.getType(), databaseContext.getMode());
+        Optional<BibEntryType> entryType = entryTypesManager.enrich(entry.getType(), databaseContext.getMode());
         if (entryType.isPresent()) {
             return entryType.get().getSecondaryOptionalNotDeprecatedFields();
         } else {
diff --git a/src/main/java/org/jabref/gui/entryeditor/OptionalFieldsTab.java b/src/main/java/org/jabref/gui/entryeditor/OptionalFieldsTab.java
index ab78b7e6677..805105f956a 100644
--- a/src/main/java/org/jabref/gui/entryeditor/OptionalFieldsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/OptionalFieldsTab.java
@@ -11,20 +11,27 @@
 
 import javafx.scene.control.Tooltip;
 
-import org.jabref.Globals;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.autocompleter.SuggestionProviders;
+import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.icon.IconTheme;
+import org.jabref.gui.util.TaskExecutor;
+import org.jabref.logic.journals.JournalAbbreviationLoader;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.BibEntryType;
+import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.entry.field.BibField;
 import org.jabref.model.entry.field.Field;
+import org.jabref.preferences.JabRefPreferences;
 
 public class OptionalFieldsTab extends FieldsEditorTab {
-    public OptionalFieldsTab(BibDatabaseContext databaseContext, SuggestionProviders suggestionProviders, UndoManager undoManager, DialogService dialogService) {
-        super(true, databaseContext, suggestionProviders, undoManager, dialogService);
+    private final BibEntryTypesManager entryTypesManager;
+
+    public OptionalFieldsTab(BibDatabaseContext databaseContext, SuggestionProviders suggestionProviders, UndoManager undoManager, DialogService dialogService, JabRefPreferences preferences, BibEntryTypesManager entryTypesManager, ExternalFileTypes externalFileTypes, TaskExecutor taskExecutor, JournalAbbreviationLoader journalAbbreviationLoader) {
+        super(true, databaseContext, suggestionProviders, undoManager, dialogService, preferences, externalFileTypes, taskExecutor, journalAbbreviationLoader);
+        this.entryTypesManager = entryTypesManager;
 
         setText(Localization.lang("Optional fields"));
         setTooltip(new Tooltip(Localization.lang("Show optional fields")));
@@ -33,7 +40,7 @@ public OptionalFieldsTab(BibDatabaseContext databaseContext, SuggestionProviders
 
     @Override
     protected SortedSet<Field> determineFieldsToShow(BibEntry entry) {
-        Optional<BibEntryType> entryType = Globals.entryTypesManager.enrich(entry.getType(), databaseContext.getMode());
+        Optional<BibEntryType> entryType = entryTypesManager.enrich(entry.getType(), databaseContext.getMode());
         if (entryType.isPresent()) {
             return entryType.get().getPrimaryOptionalFields().stream().map(BibField::getField).collect(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(Field::getName))));
         } else {
diff --git a/src/main/java/org/jabref/gui/entryeditor/OtherFieldsTab.java b/src/main/java/org/jabref/gui/entryeditor/OtherFieldsTab.java
index fd02cc2da74..cf4a9b8323d 100644
--- a/src/main/java/org/jabref/gui/entryeditor/OtherFieldsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/OtherFieldsTab.java
@@ -13,34 +13,40 @@
 
 import javafx.scene.control.Tooltip;
 
-import org.jabref.Globals;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.autocompleter.SuggestionProviders;
+import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.icon.IconTheme;
+import org.jabref.gui.util.TaskExecutor;
+import org.jabref.logic.journals.JournalAbbreviationLoader;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.BibEntryType;
+import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.entry.field.BibField;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.InternalField;
+import org.jabref.preferences.JabRefPreferences;
 
 public class OtherFieldsTab extends FieldsEditorTab {
 
     private final List<Field> customTabFieldNames;
+    private final BibEntryTypesManager entryTypesManager;
 
-    public OtherFieldsTab(BibDatabaseContext databaseContext, SuggestionProviders suggestionProviders, UndoManager undoManager, List<Field> customTabFieldNames, DialogService dialogService) {
-        super(false, databaseContext, suggestionProviders, undoManager, dialogService);
+    public OtherFieldsTab(BibDatabaseContext databaseContext, SuggestionProviders suggestionProviders, UndoManager undoManager, List<Field> customTabFieldNames, DialogService dialogService, JabRefPreferences preferences, BibEntryTypesManager entryTypesManager, ExternalFileTypes externalFileTypes, TaskExecutor taskExecutor, JournalAbbreviationLoader journalAbbreviationLoader) {
+        super(false, databaseContext, suggestionProviders, undoManager, dialogService, preferences, externalFileTypes, taskExecutor, journalAbbreviationLoader);
+        this.entryTypesManager = entryTypesManager;
+        this.customTabFieldNames = customTabFieldNames;
 
         setText(Localization.lang("Other fields"));
         setTooltip(new Tooltip(Localization.lang("Show remaining fields")));
         setGraphic(IconTheme.JabRefIcons.OPTIONAL.getGraphicNode());
-        this.customTabFieldNames = customTabFieldNames;
     }
 
     @Override
     protected SortedSet<Field> determineFieldsToShow(BibEntry entry) {
-        Optional<BibEntryType> entryType = Globals.entryTypesManager.enrich(entry.getType(), databaseContext.getMode());
+        Optional<BibEntryType> entryType = entryTypesManager.enrich(entry.getType(), databaseContext.getMode());
         if (entryType.isPresent()) {
             Set<Field> allKnownFields = entryType.get().getAllFields().stream().map(BibField::getField).collect(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(Field::getName))));
             SortedSet<Field> otherFields = entry.getFields().stream().filter(field -> !allKnownFields.contains(field)).collect(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(Field::getName))));
diff --git a/src/main/java/org/jabref/gui/entryeditor/PreviewTab.java b/src/main/java/org/jabref/gui/entryeditor/PreviewTab.java
new file mode 100644
index 00000000000..35d3a197501
--- /dev/null
+++ b/src/main/java/org/jabref/gui/entryeditor/PreviewTab.java
@@ -0,0 +1,55 @@
+package org.jabref.gui.entryeditor;
+
+import org.jabref.gui.DialogService;
+import org.jabref.gui.externalfiletype.ExternalFileTypes;
+import org.jabref.gui.icon.IconTheme;
+import org.jabref.gui.preview.PreviewPanel;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.preferences.JabRefPreferences;
+
+public class PreviewTab extends EntryEditorTab {
+    private final DialogService dialogService;
+    private final BibDatabaseContext databaseContext;
+    private final JabRefPreferences preferences;
+    private final ExternalFileTypes externalFileTypes;
+    private PreviewPanel previewPanel;
+
+    public PreviewTab(BibDatabaseContext databaseContext, DialogService dialogService, JabRefPreferences preferences, ExternalFileTypes externalFileTypes) {
+        this.databaseContext = databaseContext;
+        this.dialogService = dialogService;
+        this.preferences = preferences;
+        this.externalFileTypes = externalFileTypes;
+
+        setGraphic(IconTheme.JabRefIcons.TOGGLE_ENTRY_PREVIEW.getGraphicNode());
+    }
+
+    @Override
+    protected void nextPreviewStyle() {
+        if (previewPanel != null) {
+            previewPanel.nextPreviewStyle();
+        }
+    }
+
+    @Override
+    protected void previousPreviewStyle() {
+        if (previewPanel != null) {
+            previewPanel.previousPreviewStyle();
+        }
+    }
+
+    @Override
+    public boolean shouldShow(BibEntry entry) {
+        return preferences.getPreviewPreferences().showPreviewAsExtraTab();
+    }
+
+    @Override
+    protected void bindToEntry(BibEntry entry) {
+        if (previewPanel == null) {
+            previewPanel = new PreviewPanel(databaseContext, dialogService, externalFileTypes, preferences.getKeyBindingRepository(), preferences);
+            setContent(previewPanel);
+        }
+
+        previewPanel.setEntry(entry);
+    }
+}
diff --git a/src/main/java/org/jabref/gui/entryeditor/RequiredFieldsTab.java b/src/main/java/org/jabref/gui/entryeditor/RequiredFieldsTab.java
index 04cec9c657d..2378f64c4ca 100644
--- a/src/main/java/org/jabref/gui/entryeditor/RequiredFieldsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/RequiredFieldsTab.java
@@ -10,21 +10,28 @@
 
 import javafx.scene.control.Tooltip;
 
-import org.jabref.Globals;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.autocompleter.SuggestionProviders;
+import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.icon.IconTheme;
+import org.jabref.gui.util.TaskExecutor;
+import org.jabref.logic.journals.JournalAbbreviationLoader;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.BibEntryType;
+import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.InternalField;
 import org.jabref.model.entry.field.OrFields;
+import org.jabref.preferences.JabRefPreferences;
 
 public class RequiredFieldsTab extends FieldsEditorTab {
-    public RequiredFieldsTab(BibDatabaseContext databaseContext, SuggestionProviders suggestionProviders, UndoManager undoManager, DialogService dialogService) {
-        super(false, databaseContext, suggestionProviders, undoManager, dialogService);
+    private final BibEntryTypesManager entryTypesManager;
+
+    public RequiredFieldsTab(BibDatabaseContext databaseContext, SuggestionProviders suggestionProviders, UndoManager undoManager, DialogService dialogService, JabRefPreferences preferences, BibEntryTypesManager entryTypesManager, ExternalFileTypes externalFileTypes, TaskExecutor taskExecutor, JournalAbbreviationLoader journalAbbreviationLoader) {
+        super(false, databaseContext, suggestionProviders, undoManager, dialogService, preferences, externalFileTypes, taskExecutor, journalAbbreviationLoader);
+        this.entryTypesManager = entryTypesManager;
 
         setText(Localization.lang("Required fields"));
         setTooltip(new Tooltip(Localization.lang("Show required fields")));
@@ -33,7 +40,7 @@ public RequiredFieldsTab(BibDatabaseContext databaseContext, SuggestionProviders
 
     @Override
     protected SortedSet<Field> determineFieldsToShow(BibEntry entry) {
-        Optional<BibEntryType> entryType = Globals.entryTypesManager.enrich(entry.getType(), databaseContext.getMode());
+        Optional<BibEntryType> entryType = entryTypesManager.enrich(entry.getType(), databaseContext.getMode());
         SortedSet<Field> fields = new TreeSet<>(Comparator.comparing(Field::getName));
         if (entryType.isPresent()) {
             fields.addAll(entryType.get().getRequiredFields().stream().map(OrFields::getPrimary).collect(Collectors.toSet()));
diff --git a/src/main/java/org/jabref/gui/entryeditor/UserDefinedFieldsTab.java b/src/main/java/org/jabref/gui/entryeditor/UserDefinedFieldsTab.java
index e602dbff242..f9275df0566 100644
--- a/src/main/java/org/jabref/gui/entryeditor/UserDefinedFieldsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/UserDefinedFieldsTab.java
@@ -9,16 +9,22 @@
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.autocompleter.SuggestionProviders;
+import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.icon.IconTheme;
+import org.jabref.gui.util.TaskExecutor;
+import org.jabref.logic.journals.JournalAbbreviationLoader;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.entry.field.Field;
+import org.jabref.preferences.JabRefPreferences;
 
 public class UserDefinedFieldsTab extends FieldsEditorTab {
     private final SortedSet<Field> fields;
 
-    public UserDefinedFieldsTab(String name, Set<Field> fields, BibDatabaseContext databaseContext, SuggestionProviders suggestionProviders, UndoManager undoManager, DialogService dialogService) {
-        super(false, databaseContext, suggestionProviders, undoManager, dialogService);
+    public UserDefinedFieldsTab(String name, Set<Field> fields, BibDatabaseContext databaseContext, SuggestionProviders suggestionProviders, UndoManager undoManager, DialogService dialogService, JabRefPreferences preferences, BibEntryTypesManager entryTypesManager, ExternalFileTypes externalFileTypes, TaskExecutor taskExecutor, JournalAbbreviationLoader journalAbbreviationLoader) {
+        super(false, databaseContext, suggestionProviders, undoManager, dialogService, preferences, externalFileTypes, taskExecutor, journalAbbreviationLoader);
+
         this.fields = new TreeSet<>(Comparator.comparing(Field::getName));
         this.fields.addAll(fields);
 
diff --git a/src/main/java/org/jabref/gui/preferences/PreviewTab.fxml b/src/main/java/org/jabref/gui/preferences/PreviewTab.fxml
index e5564dfa21f..cd29607cff4 100644
--- a/src/main/java/org/jabref/gui/preferences/PreviewTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/PreviewTab.fxml
@@ -1,21 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <?import javafx.scene.control.Button?>
+<?import javafx.scene.control.CheckBox?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.ListView?>
 <?import javafx.scene.control.Tab?>
 <?import javafx.scene.control.TabPane?>
+<?import javafx.scene.control.Tooltip?>
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
+<?import org.jabref.gui.icon.JabRefIconView?>
 <?import org.fxmisc.flowless.VirtualizedScrollPane?>
 <?import org.fxmisc.richtext.CodeArea?>
-<?import org.jabref.gui.icon.JabRefIconView?>
-<?import javafx.scene.control.Tooltip?>
 <fx:root prefWidth="650.0" spacing="4.0" type="VBox" xmlns="http://javafx.com/javafx/8.0.212"
          xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.preferences.PreviewTabView">
     <Label text="%Current Preview" styleClass="titleHeader"/>
     <HBox spacing="4.0">
+        <CheckBox fx:id="showAsTabCheckBox" text="%Show preview as a tab in entry editor"/>
         <VBox spacing="4.0" HBox.hgrow="ALWAYS">
             <Label text="%Available" styleClass="sectionHeader"/>
             <ListView fx:id="availableListView" maxHeight="250.0" minHeight="250.0"/>
diff --git a/src/main/java/org/jabref/gui/preferences/PreviewTabView.java b/src/main/java/org/jabref/gui/preferences/PreviewTabView.java
index c75bfd93d61..5c4678db9d3 100644
--- a/src/main/java/org/jabref/gui/preferences/PreviewTabView.java
+++ b/src/main/java/org/jabref/gui/preferences/PreviewTabView.java
@@ -7,6 +7,7 @@
 import javafx.beans.property.ListProperty;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
+import javafx.scene.control.CheckBox;
 import javafx.scene.control.ContextMenu;
 import javafx.scene.control.Label;
 import javafx.scene.control.ListView;
@@ -39,6 +40,7 @@
 
 public class PreviewTabView extends AbstractPreferenceTabView<PreviewTabViewModel> implements PreferencesTab {
 
+    @FXML private CheckBox showAsTabCheckBox;
     @FXML private ListView<PreviewLayout> availableListView;
     @FXML private ListView<PreviewLayout> chosenListView;
     @FXML private Button toRightButton;
@@ -113,6 +115,8 @@ public void initialize() {
         contextMenu.getItems().forEach(item -> item.setGraphic(null));
         contextMenu.getStyleClass().add("context-menu");
 
+        showAsTabCheckBox.selectedProperty().bindBidirectional(viewModel.showAsExtraTabProperty());
+
         availableListView.itemsProperty().bindBidirectional(viewModel.availableListProperty());
         viewModel.availableSelectionModelProperty().setValue(availableListView.getSelectionModel());
         new ViewModelListCellFactory<PreviewLayout>()
diff --git a/src/main/java/org/jabref/gui/preferences/PreviewTabViewModel.java b/src/main/java/org/jabref/gui/preferences/PreviewTabViewModel.java
index 32d2bbff98b..e25f26e4260 100644
--- a/src/main/java/org/jabref/gui/preferences/PreviewTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/PreviewTabViewModel.java
@@ -56,21 +56,17 @@ public class PreviewTabViewModel implements PreferenceTabViewModel {
     private final ObjectProperty<MultipleSelectionModel<PreviewLayout>> availableSelectionModelProperty = new SimpleObjectProperty<>(new NoSelectionModel<>());
     private final ListProperty<PreviewLayout> chosenListProperty = new SimpleListProperty<>(FXCollections.observableArrayList());
     private final ObjectProperty<MultipleSelectionModel<PreviewLayout>> chosenSelectionModelProperty = new SimpleObjectProperty<>(new NoSelectionModel<>());
-
+    private final BooleanProperty showAsExtraTab = new SimpleBooleanProperty(false);
     private final BooleanProperty selectedIsEditableProperty = new SimpleBooleanProperty(false);
-
     private final ObjectProperty<PreviewLayout> layoutProperty = new SimpleObjectProperty<>();
     private final StringProperty sourceTextProperty = new SimpleStringProperty("");
-
-    private FunctionBasedValidator chosenListValidator;
-
     private final DialogService dialogService;
     private final JabRefPreferences preferences;
     private final PreviewPreferences previewPreferences;
     private final TaskExecutor taskExecutor;
-
-    private ListProperty<PreviewLayout> dragSourceList = null;
     private final CustomLocalDragboard localDragboard = GUIGlobals.localDragboard;
+    private FunctionBasedValidator chosenListValidator;
+    private ListProperty<PreviewLayout> dragSourceList = null;
 
     public PreviewTabViewModel(DialogService dialogService, JabRefPreferences preferences, TaskExecutor taskExecutor) {
         this.dialogService = dialogService;
@@ -96,7 +92,12 @@ public PreviewTabViewModel(DialogService dialogService, JabRefPreferences prefer
         );
     }
 
+    public BooleanProperty showAsExtraTabProperty() {
+        return showAsExtraTab;
+    }
+
     public void setValues() {
+        showAsExtraTab.set(previewPreferences.showPreviewAsExtraTab());
         chosenListProperty().getValue().clear();
         chosenListProperty.getValue().addAll(previewPreferences.getPreviewCycle());
 
@@ -187,6 +188,7 @@ public void storeSettings() {
         PreviewPreferences newPreviewPreferences = preferences.getPreviewPreferences()
                                                               .getBuilder()
                                                               .withPreviewCycle(chosenListProperty)
+                                                              .withShowAsExtraTab(showAsExtraTab.getValue())
                                                               .withPreviewStyle(((TextBasedPreviewLayout) previewStyle).getText())
                                                               .build();
 
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index 9d6947d8be1..ea711be51a6 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -365,7 +365,7 @@ public class JabRefPreferences implements PreferencesService {
     private static final String CYCLE_PREVIEW_POS = "cyclePreviewPos";
     private static final String CYCLE_PREVIEW = "cyclePreview";
     private static final String PREVIEW_PANEL_HEIGHT = "previewPanelHeightFX";
-    private static final String PREVIEW_ENABLED = "previewEnabled";
+    private static final String PREVIEW_AS_TAB = "previewAsTab";
 
     // Auto completion
     private static final String AUTO_COMPLETE = "autoComplete";
@@ -745,7 +745,7 @@ private JabRefPreferences() {
         defaults.put(CYCLE_PREVIEW, "Preview;" + CitationStyle.DEFAULT);
         defaults.put(CYCLE_PREVIEW_POS, 0);
         defaults.put(PREVIEW_PANEL_HEIGHT, 0.65);
-        defaults.put(PREVIEW_ENABLED, Boolean.TRUE);
+        defaults.put(PREVIEW_AS_TAB, Boolean.FALSE);
         defaults.put(PREVIEW_STYLE,
                      "<font face=\"sans-serif\">"
                                     + "<b><i>\\bibtextype</i><a name=\"\\bibtexkey\">\\begin{bibtexkey} (\\bibtexkey)</a>"
@@ -1595,7 +1595,7 @@ public JabRefPreferences storePreviewPreferences(PreviewPreferences previewPrefe
         }).collect(Collectors.toList()));
         putDouble(PREVIEW_PANEL_HEIGHT, previewPreferences.getPreviewPanelDividerPosition().doubleValue());
         put(PREVIEW_STYLE, previewPreferences.getPreviewStyle());
-        putBoolean(PREVIEW_ENABLED, previewPreferences.isPreviewPanelEnabled());
+        putBoolean(PREVIEW_AS_TAB, previewPreferences.showPreviewAsExtraTab());
         return this;
     }
 
@@ -1605,7 +1605,7 @@ public PreviewPreferences getPreviewPreferences() {
         double panelHeight = getDouble(PREVIEW_PANEL_HEIGHT);
         String style = get(PREVIEW_STYLE);
         String styleDefault = (String) defaults.get(PREVIEW_STYLE);
-        boolean enabled = getBoolean(PREVIEW_ENABLED);
+        boolean showAsTab = getBoolean(PREVIEW_AS_TAB);
 
         // For backwards compatibility always add at least the default preview to the cycle
         if (cycle.isEmpty()) {
@@ -1633,7 +1633,7 @@ public PreviewPreferences getPreviewPreferences() {
             cyclePos = 0; // fallback if stored position is no longer valid
         }
 
-        return new PreviewPreferences(layouts, cyclePos, panelHeight, enabled, style, styleDefault);
+        return new PreviewPreferences(layouts, cyclePos, panelHeight, style, styleDefault, showAsTab);
     }
 
     public void storeProxyPreferences(ProxyPreferences proxyPreferences) {
diff --git a/src/main/java/org/jabref/preferences/PreviewPreferences.java b/src/main/java/org/jabref/preferences/PreviewPreferences.java
index 38473567104..efec4035934 100644
--- a/src/main/java/org/jabref/preferences/PreviewPreferences.java
+++ b/src/main/java/org/jabref/preferences/PreviewPreferences.java
@@ -12,17 +12,17 @@ public class PreviewPreferences {
     private final List<PreviewLayout> previewCycle;
     private final int previewCyclePosition;
     private final Number previewPanelDividerPosition;
-    private final boolean previewPanelEnabled;
     private final String previewStyle;
     private final String previewStyleDefault;
+    private final boolean showPreviewAsExtraTab;
 
-    public PreviewPreferences(List<PreviewLayout> previewCycle, int previewCyclePosition, Number previewPanelDividerPosition, boolean previewPanelEnabled, String previewStyle, String previewStyleDefault) {
+    public PreviewPreferences(List<PreviewLayout> previewCycle, int previewCyclePosition, Number previewPanelDividerPosition, String previewStyle, String previewStyleDefault, boolean showPreviewAsExtraTab) {
         this.previewCycle = previewCycle;
         this.previewCyclePosition = previewCyclePosition;
         this.previewPanelDividerPosition = previewPanelDividerPosition;
-        this.previewPanelEnabled = previewPanelEnabled;
         this.previewStyle = previewStyle;
         this.previewStyleDefault = previewStyleDefault;
+        this.showPreviewAsExtraTab = showPreviewAsExtraTab;
     }
 
     public List<PreviewLayout> getPreviewCycle() {
@@ -37,10 +37,6 @@ public Number getPreviewPanelDividerPosition() {
         return previewPanelDividerPosition;
     }
 
-    public boolean isPreviewPanelEnabled() {
-        return previewPanelEnabled;
-    }
-
     public String getPreviewStyle() {
         return previewStyle;
     }
@@ -65,12 +61,16 @@ public PreviewLayout getTextBasedPreviewLayout() {
         return new TextBasedPreviewLayout(getPreviewStyle(), getLayoutFormatterPreferences());
     }
 
+    public boolean showPreviewAsExtraTab() {
+        return showPreviewAsExtraTab;
+    }
+
     public static class Builder {
 
+        private boolean showPreviewAsExtraTab;
         private List<PreviewLayout> previewCycle;
         private int previewCyclePosition;
         private Number previewPanelDividerPosition;
-        private boolean previewPanelEnabled;
         private String previewStyle;
         private final String previewStyleDefault;
 
@@ -78,9 +78,14 @@ public Builder(PreviewPreferences previewPreferences) {
             this.previewCycle = previewPreferences.getPreviewCycle();
             this.previewCyclePosition = previewPreferences.getPreviewCyclePosition();
             this.previewPanelDividerPosition = previewPreferences.getPreviewPanelDividerPosition();
-            this.previewPanelEnabled = previewPreferences.isPreviewPanelEnabled();
             this.previewStyle = previewPreferences.getPreviewStyle();
             this.previewStyleDefault = previewPreferences.getDefaultPreviewStyle();
+            this.showPreviewAsExtraTab = previewPreferences.showPreviewAsExtraTab();
+        }
+
+        public Builder withShowAsExtraTab(boolean showAsExtraTab) {
+            this.showPreviewAsExtraTab = showAsExtraTab;
+            return this;
         }
 
         public Builder withPreviewCycle(List<PreviewLayout> previewCycle) {
@@ -106,18 +111,13 @@ public Builder withPreviewPanelDividerPosition(Number previewPanelDividerPositio
             return this;
         }
 
-        public Builder withPreviewPanelEnabled(boolean previewPanelEnabled) {
-            this.previewPanelEnabled = previewPanelEnabled;
-            return this;
-        }
-
         public Builder withPreviewStyle(String previewStyle) {
             this.previewStyle = previewStyle;
             return this;
         }
 
         public PreviewPreferences build() {
-            return new PreviewPreferences(previewCycle, previewCyclePosition, previewPanelDividerPosition, previewPanelEnabled, previewStyle, previewStyleDefault);
+            return new PreviewPreferences(previewCycle, previewCyclePosition, previewPanelDividerPosition, previewStyle, previewStyleDefault, showPreviewAsExtraTab);
         }
     }
 
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index c1f822503b6..5b9d9f3027c 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -2104,7 +2104,7 @@ New\ column=New column
 Open\ files...=Open files...
 
 Affected\ fields\:=Affected fields:
-
+Show\ preview\ as\ a\ tab\ in\ entry\ editor=Show preview as a tab in entry editor
 Font=Font
 Visual\ theme=Visual theme
 Light\ theme=Light theme