diff --git a/jadx-gui/src/main/java/jadx/gui/ui/CommonSearchDialog.java b/jadx-gui/src/main/java/jadx/gui/ui/CommonSearchDialog.java
index 84078b3034b2e42c48a8dc97998b28fbae87078e..ea777411ba5964f4d121bae3acd08db3f74e294a 100644
--- a/jadx-gui/src/main/java/jadx/gui/ui/CommonSearchDialog.java
+++ b/jadx-gui/src/main/java/jadx/gui/ui/CommonSearchDialog.java
@@ -95,7 +95,9 @@ public abstract class CommonSearchDialog extends JDialog {
 	protected abstract void loadStart();
 
 	public void loadWindowPos() {
-		mainWindow.getSettings().loadWindowPos(this);
+		if (!mainWindow.getSettings().loadWindowPos(this)) {
+			setSize(800, 500);
+		}
 	}
 
 	public void prepare() {
diff --git a/jadx-gui/src/main/java/jadx/gui/utils/layout/WrapLayout.java b/jadx-gui/src/main/java/jadx/gui/utils/layout/WrapLayout.java
index 8800b184b0d47f9614cdd575b9000ba6fc1d6796..2a399e352e6d23785ba212e79d62ab59ef9bca79 100644
--- a/jadx-gui/src/main/java/jadx/gui/utils/layout/WrapLayout.java
+++ b/jadx-gui/src/main/java/jadx/gui/utils/layout/WrapLayout.java
@@ -128,10 +128,10 @@ public class WrapLayout extends FlowLayout {
 
 				if (m.isVisible()) {
 					Dimension d = preferred ? m.getPreferredSize() : m.getMinimumSize();
+					int width = d.width;
 
 					// Can't add the component to current row. Start a new row.
-
-					if (rowWidth + d.width > maxWidth) {
+					if (rowWidth + width >= maxWidth) {
 						addRow(dim, rowWidth, rowHeight);
 						rowWidth = 0;
 						rowHeight = 0;
@@ -143,7 +143,7 @@ public class WrapLayout extends FlowLayout {
 						rowWidth += hgap;
 					}
 
-					rowWidth += d.width;
+					rowWidth += width;
 					rowHeight = Math.max(rowHeight, d.height);
 				}
 			}