diff --git a/CHANGELOG.md b/CHANGELOG.md
index ccccef747af..e913361bb93 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -50,6 +50,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 - We changed the command line option 'generateBibtexKeys' to the more generic term 'generateCitationKeys' while the short option remains 'g'.[#6545](https://github.com/JabRef/jabref/pull/6545)
 - We improved the "Possible duplicate entries" window to remember its size and position throughout a session. [#6582](https://github.com/JabRef/jabref/issues/6582)
 - We divided the toolbar into small parts, so if the application window is to small, only a part of the toolbar is moved into the chevron popup. [#6682](https://github.com/JabRef/jabref/pull/6682)
+- We changed the layout for of the buttons in the Open Office side panel to ensure that the button text is always visible, specially when resizing. [#6639](https://github.com/JabRef/jabref/issues/6639)
 
 ### Fixed
 
diff --git a/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java b/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java
index 2f912d2d09a..bff1e366d35 100644
--- a/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java
+++ b/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java
@@ -11,6 +11,7 @@
 import java.util.stream.Collectors;
 
 import javafx.concurrent.Task;
+import javafx.geometry.Insets;
 import javafx.geometry.Side;
 import javafx.scene.Node;
 import javafx.scene.control.Button;
@@ -22,6 +23,7 @@
 import javafx.scene.control.SeparatorMenuItem;
 import javafx.scene.control.ToggleGroup;
 import javafx.scene.control.Tooltip;
+import javafx.scene.layout.FlowPane;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Priority;
 import javafx.scene.layout.VBox;
@@ -264,19 +266,18 @@ private void initPanel() {
         HBox hbox = new HBox();
         hbox.getChildren().addAll(connect, manualConnect, selectDocument, update, help);
         hbox.getChildren().forEach(btn -> HBox.setHgrow(btn, Priority.ALWAYS));
-
-        VBox row1 = new VBox();
-        VBox row2 = new VBox();
-        VBox row3 = new VBox();
-        row1.getChildren().addAll(setStyleFile, pushEntries, pushEntriesInt);
-        row2.getChildren().addAll(pushEntriesAdvanced, pushEntriesEmpty, merge);
-        row3.getChildren().addAll(manageCitations, exportCitations, settingsB);
-        HBox hbox1 = new HBox();
-        hbox1.getChildren().addAll(row1, row2, row3);
-        hbox1.getChildren().forEach(btn -> HBox.setHgrow(btn, Priority.ALWAYS));
+        
+        FlowPane flow = new FlowPane();
+        flow.setPadding(new Insets(5, 5, 5, 5));
+        flow.setVgap(4);
+        flow.setHgap(4);
+        flow.setPrefWrapLength(200);
+        flow.getChildren().addAll(setStyleFile, pushEntries, pushEntriesInt);
+        flow.getChildren().addAll(pushEntriesAdvanced, pushEntriesEmpty, merge);
+        flow.getChildren().addAll(manageCitations, exportCitations, settingsB);
 
         vbox.setFillWidth(true);
-        vbox.getChildren().addAll(hbox, hbox1);
+        vbox.getChildren().addAll(hbox, flow);
     }
 
     private void exportEntries() {