diff --git a/components/synedit/synedit.pp b/components/synedit/synedit.pp
index 04063013d5..679f10feba 100644
--- a/components/synedit/synedit.pp
+++ b/components/synedit/synedit.pp
@@ -2269,7 +2269,7 @@ begin
     {$ENDIF}
   end;
   {$IFDEF SYN_LAZARUS}
-  if (X < fGutterWidth) then begin
+  if (X < fGutterWidth) and (Button=mbLeft) then begin
     Include(fStateFlags, sfPossibleGutterClick);
     DoOnGutterClick(X, Y);
   end;
diff --git a/ide/uniteditor.pp b/ide/uniteditor.pp
index 251cb8847b..f1b3c95ebd 100644
--- a/ide/uniteditor.pp
+++ b/ide/uniteditor.pp
@@ -3331,6 +3331,7 @@ Begin
           else
             Pages.Add('unit1');
           PageIndex := 0;   // Set it to the first page
+          PopupMenu := SrcPopupMenu;
           if EditorOpts.ShowTabCloseButtons then
             Options:=Options+[nboShowCloseButtons]
           else
diff --git a/lcl/extctrls.pp b/lcl/extctrls.pp
index 7afd093b1d..012813d75b 100644
--- a/lcl/extctrls.pp
+++ b/lcl/extctrls.pp
@@ -273,6 +273,7 @@ type
     property OnResize;
     property Options;
     property PageIndex;
+    property PopupMenu;
     property ShowTabs;
   end;