diff --git a/debugger/frames/debugger_class_options.pas b/debugger/frames/debugger_class_options.pas
index a6d1afd809..3aa6392991 100644
--- a/debugger/frames/debugger_class_options.pas
+++ b/debugger/frames/debugger_class_options.pas
@@ -522,6 +522,11 @@ var
   m: TMenuItem;
   i: Integer;
 begin
+  {$IFDEF linux}
+  // Workaround for issue https://bugs.freepascal.org/view.php?id=36305 https://bugs.freepascal.org/view.php?id=36306
+  tbDropMenu := TPopupMenu.Create(Self);
+  tbSelect.DropdownMenu := tbDropMenu;
+  {$ENDIF}
   tbDropMenu.Items.Clear;
   for i := 0 to FCopiedDbgPropertiesConfigList.Count - 1 do
     if (not FCopiedDbgPropertiesConfigList.Opt[i].IsDeleted) and