diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0377e840..76bee1fa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,10 +26,12 @@ FlatLaf Change Log
   #761)
 - ScrollPane: Styling ScrollPane border properties did not work if view
   component is a Table.
-- Table: Switching theme looses table grid and intercell spacing. (issues #733
-  and #750)
-- Table: Fixed background of `boolean` columns when using alternating row
-  colors. (issue #780)
+- Table:
+  - Switching theme looses table grid and intercell spacing. (issues #733 and
+    #750)
+  - Fixed background of `boolean` columns when using alternating row colors.
+    (issue #780)
+  - Fixed border arc of components in complex table cell editors. (issue #786)
 - TableHeader: No longer temporary replace header cell renderer while painting.
   This avoids a `StackOverflowError` in case that custom renderer does this too.
   (see [NetBeans issue #6835](https://github.com/apache/netbeans/issues/6835))
diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatUIUtils.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatUIUtils.java
index 2d56d887..da41b764 100644
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatUIUtils.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatUIUtils.java
@@ -299,15 +299,10 @@ public class FlatUIUtils
 		if( c == null )
 			return false;
 
-		// check whether used in cell editor (check 3 levels up)
-		Component c2 = c;
-		for( int i = 0; i <= 2 && c2 != null; i++ ) {
-			Container parent = c2.getParent();
-			if( parent instanceof JTable && ((JTable)parent).getEditorComponent() == c2 )
-				return true;
-
-			c2 = parent;
-		}
+		// check whether used as table cell editor
+		Container parent = c.getParent();
+		if( parent instanceof JTable && ((JTable)parent).getEditorComponent() == c )
+			return true;
 
 		// check whether used as cell editor
 		//   Table.editor is set in JTable.GenericEditor constructor