diff --git a/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatCompletionProvider.java b/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatCompletionProvider.java
index 6d83e9f8..c9522891 100644
--- a/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatCompletionProvider.java
+++ b/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatCompletionProvider.java
@@ -371,8 +371,10 @@ class FlatCompletionProvider
 
 				if( key.startsWith( "*." ) ) {
 					// resolve wildcard
-					for( String k : FlatThemePropertiesSupport.getKeysForWildcard( key ) )
-						completions.add( new BasicCompletion( this, "$".concat( k ) ) );
+					for( String k : FlatThemePropertiesSupport.getKeysForWildcard( key ) ) {
+						if( !keys.contains( k ) )
+							completions.add( new BasicCompletion( this, "$".concat( k ) ) );
+					}
 					continue;
 				}
 
diff --git a/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatFindReplaceBar.java b/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatFindReplaceBar.java
index 5429fffc..3c907a2d 100644
--- a/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatFindReplaceBar.java
+++ b/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatFindReplaceBar.java
@@ -22,6 +22,7 @@ import java.awt.event.KeyEvent;
 import java.util.List;
 import java.util.function.Consumer;
 import javax.swing.*;
+import javax.swing.border.MatteBorder;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
 import com.formdev.flatlaf.extras.components.*;
@@ -78,6 +79,13 @@ class FlatFindReplaceBar
 		setSearchContext( context );
 	}
 
+	@Override
+	public void updateUI() {
+		super.updateUI();
+
+		setBorder( new MatteBorder( 1, 0, 0, 0, UIManager.getColor( "Component.borderColor" ) ) );
+	}
+
 	SearchContext getSearchContext() {
 		return context;
 	}
@@ -302,7 +310,7 @@ class FlatFindReplaceBar
 		//======== findToolBar ========
 		{
 			findToolBar.setFloatable(false);
-			findToolBar.setBorder(null);
+			findToolBar.setBorder(BorderFactory.createEmptyBorder());
 
 			//---- findPreviousButton ----
 			findPreviousButton.setToolTipText("Previous Occurrence");
@@ -339,7 +347,7 @@ class FlatFindReplaceBar
 		//======== closeToolBar ========
 		{
 			closeToolBar.setFloatable(false);
-			closeToolBar.setBorder(null);
+			closeToolBar.setBorder(BorderFactory.createEmptyBorder());
 
 			//---- closeButton ----
 			closeButton.setToolTipText("Close");
@@ -362,7 +370,7 @@ class FlatFindReplaceBar
 		//======== toolBar1 ========
 		{
 			toolBar1.setFloatable(false);
-			toolBar1.setBorder(null);
+			toolBar1.setBorder(BorderFactory.createEmptyBorder());
 
 			//---- replaceButton ----
 			replaceButton.setText("Replace");
diff --git a/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatFindReplaceBar.jfd b/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatFindReplaceBar.jfd
index bc0c6d0c..e852b805 100644
--- a/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatFindReplaceBar.jfd
+++ b/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatFindReplaceBar.jfd
@@ -29,7 +29,7 @@ new FormModel {
 			add( new FormContainer( "javax.swing.JToolBar", new FormLayoutManager( class javax.swing.JToolBar ) ) {
 				name: "findToolBar"
 				"floatable": false
-				"border": sfield com.jformdesigner.model.FormObject NULL_VALUE
+				"border": new javax.swing.border.EmptyBorder( 0, 0, 0, 0 )
 				add( new FormComponent( "javax.swing.JButton" ) {
 					name: "findPreviousButton"
 					"toolTipText": "Previous Occurrence"
@@ -70,7 +70,7 @@ new FormModel {
 			add( new FormContainer( "javax.swing.JToolBar", new FormLayoutManager( class javax.swing.JToolBar ) ) {
 				name: "closeToolBar"
 				"floatable": false
-				"border": sfield com.jformdesigner.model.FormObject NULL_VALUE
+				"border": new javax.swing.border.EmptyBorder( 0, 0, 0, 0 )
 				add( new FormComponent( "javax.swing.JButton" ) {
 					name: "closeButton"
 					"toolTipText": "Close"
@@ -97,7 +97,7 @@ new FormModel {
 			add( new FormContainer( "javax.swing.JToolBar", new FormLayoutManager( class javax.swing.JToolBar ) ) {
 				name: "toolBar1"
 				"floatable": false
-				"border": sfield com.jformdesigner.model.FormObject NULL_VALUE
+				"border": new javax.swing.border.EmptyBorder( 0, 0, 0, 0 )
 				add( new FormComponent( "javax.swing.JButton" ) {
 					name: "replaceButton"
 					"text": "Replace"
diff --git a/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemeEditorPane.java b/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemeEditorPane.java
index a1328084..f0d37ff6 100644
--- a/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemeEditorPane.java
+++ b/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemeEditorPane.java
@@ -35,7 +35,6 @@ import javax.swing.JScrollPane;
 import javax.swing.KeyStroke;
 import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
-import javax.swing.border.MatteBorder;
 import org.fife.rsta.ui.CollapsibleSectionPanel;
 import org.fife.ui.autocomplete.AutoCompletion;
 import org.fife.ui.autocomplete.CompletionProvider;
@@ -262,8 +261,6 @@ class FlatThemeEditorPane
 	void showFindReplaceBar() {
 		if( findReplaceBar == null ) {
 			findReplaceBar = new FlatFindReplaceBar( textArea );
-			findReplaceBar.setBorder( new MatteBorder( 1, 0, 0, 0,
-				UIManager.getColor( "Component.borderColor" ) ) );
 			collapsiblePanel.addBottomComponent( findReplaceBar );
 		}