diff --git a/flatlaf-jide-oss/src/main/java/com/formdev/flatlaf/jideoss/ui/FlatJidePopupMenuUI.java b/flatlaf-jide-oss/src/main/java/com/formdev/flatlaf/jideoss/ui/FlatJidePopupMenuUI.java
new file mode 100644
index 00000000..d5ebd203
--- /dev/null
+++ b/flatlaf-jide-oss/src/main/java/com/formdev/flatlaf/jideoss/ui/FlatJidePopupMenuUI.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2021 FormDev Software GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.formdev.flatlaf.jideoss.ui;
+
+import javax.swing.*;
+import javax.swing.plaf.ComponentUI;
+import com.formdev.flatlaf.ui.FlatPopupMenuUI;
+import com.jidesoft.plaf.basic.BasicJidePopupMenuUI;
+
+/**
+ * Provides the Flat LaF UI delegate for {@link com.jidesoft.swing.JidePopupMenu}.
+ */
+public class FlatJidePopupMenuUI
+	extends FlatPopupMenuUI
+{
+	public static ComponentUI createUI( JComponent c ) {
+		return new FlatJidePopupMenuUI();
+	}
+
+	@Override
+	public Popup getPopup( JPopupMenu popupMenu, int x, int y ) {
+		Popup popup = BasicJidePopupMenuUI.addScrollPaneIfNecessary( popupMenu, x, y );
+		return popup == null ? super.getPopup( popupMenu, x, y ) : popup;
+	}
+}
diff --git a/flatlaf-jide-oss/src/main/resources/com/formdev/flatlaf/jideoss/FlatLaf.properties b/flatlaf-jide-oss/src/main/resources/com/formdev/flatlaf/jideoss/FlatLaf.properties
index b7be0abb..26a05cfa 100644
--- a/flatlaf-jide-oss/src/main/resources/com/formdev/flatlaf/jideoss/FlatLaf.properties
+++ b/flatlaf-jide-oss/src/main/resources/com/formdev/flatlaf/jideoss/FlatLaf.properties
@@ -16,6 +16,7 @@
 
 #---- UI delegates ----
 
+JidePopupMenuUI = com.formdev.flatlaf.jideoss.ui.FlatJidePopupMenuUI
 JideTabbedPaneUI = com.formdev.flatlaf.jideoss.ui.FlatJideTabbedPaneUI
 RangeSliderUI = com.formdev.flatlaf.jideoss.ui.FlatRangeSliderUI