diff --git a/components/lazutils/utf8process.pp b/components/lazutils/utf8process.pp
index 529236217a..790794a1b3 100644
--- a/components/lazutils/utf8process.pp
+++ b/components/lazutils/utf8process.pp
@@ -54,7 +54,11 @@ type
   end;
 {$ENDIF}
 
-procedure RunCmdFromPath(const ProgramFilename, CmdLineParameters: string);
+// poWaitOnExit prevents a zombie process but locks the calling program until the process
+// terminates. When runnning a GUI application you may want to use [] as ProcessOpts.
+procedure RunCmdFromPath(const ProgramFilename, CmdLineParameters: string;
+  ProcessOpts: TProcessOptions = [poWaitOnExit]);
+
 function FindFilenameOfCmd(ProgramFilename: string): string;
 
 function GetSystemThreadCount: integer; // guess number of cores
@@ -156,7 +160,8 @@ end;
 // For example: ProgramFilename='ls' CmdLineParameters='-l /home'
 // Will locate and execute the file '/bin/ls'
 // If the command isn't found, an exception will be raised
-procedure RunCmdFromPath(const ProgramFilename, CmdLineParameters: string);
+procedure RunCmdFromPath(const ProgramFilename, CmdLineParameters: string;
+  ProcessOpts: TProcessOptions);
 var
   NewProgramFilename: String;
   BrowserProcess: TProcessUTF8;
@@ -172,7 +177,7 @@ begin
   BrowserProcess := TProcessUTF8.Create(nil);
   try
     BrowserProcess.InheritHandles:=false;
-    BrowserProcess.Options := [poWaitOnExit];       // Prevent a zombie process.
+    BrowserProcess.Options := ProcessOpts;
     // Encloses the executable with "" if its name has spaces
     if Pos(' ',NewProgramFilename)>0 then
       NewProgramFilename:='"'+NewProgramFilename+'"';
diff --git a/ide/sourceeditor.pp b/ide/sourceeditor.pp
index 17c28917e4..78ffdeea3f 100644
--- a/ide/sourceeditor.pp
+++ b/ide/sourceeditor.pp
@@ -9033,7 +9033,7 @@ end;
 
 procedure TSourceNotebook.OpenFolderMenuItemClick(Sender: TObject);
 begin
-  OpenDocument(ExtractFilePath(Statusbar.Panels[CStatusPanelFile].Text));
+  SelectInFolder(Statusbar.Panels[CStatusPanelFile].Text);
 end;
 
 procedure TSourceNotebook.ExecuteEditorItemClick(Sender: TObject);
diff --git a/lcl/include/sysenvapis_amiga.inc b/lcl/include/sysenvapis_amiga.inc
index 408ade0d29..aa27355c18 100644
--- a/lcl/include/sysenvapis_amiga.inc
+++ b/lcl/include/sysenvapis_amiga.inc
@@ -90,14 +90,21 @@ begin
   Result := False;
 end;
 
-// Open a given URL with whatever Windows thinks is appropriate
+// ToDo: Implement
 function OpenURL(AURL: String): Boolean;
 begin
   Result := False;
 end;
 
-// Open a document with the default application associated with it in the system
+// ToDo: Implement
 function OpenDocument(APath: String): Boolean;
 begin
   Result := OpenURL(APath);
 end;
+
+// ToDo: Implement
+function SelectInFolder(AFullPath: String): Boolean;
+begin
+  Result := OpenDocument(ExtractFilePath(AFullPath));
+end;
+
diff --git a/lcl/include/sysenvapis_mac.inc b/lcl/include/sysenvapis_mac.inc
index ce4857dfad..9260ce91fb 100644
--- a/lcl/include/sysenvapis_mac.inc
+++ b/lcl/include/sysenvapis_mac.inc
@@ -51,3 +51,11 @@ begin
     ResultingPath:=APath;
   RunCmdFromPath('open',ResultingPath);
 end;
+
+// ToDo: Implement
+// Now just open the folder in system filemanager.
+function SelectInFolder(AFullPath: String): Boolean;
+begin
+  Result := OpenDocument(ExtractFilePath(AFullPath));
+end;
+
diff --git a/lcl/include/sysenvapis_unix.inc b/lcl/include/sysenvapis_unix.inc
index 19fc866768..23df05f7e0 100644
--- a/lcl/include/sysenvapis_unix.inc
+++ b/lcl/include/sysenvapis_unix.inc
@@ -6,7 +6,6 @@ begin
   Result := FindPredefinedBrowser(ABrowser, AParams);
 end;
 
-// Open a given URL with the default browser
 function OpenURL(AURL: String): Boolean;
 var
   ABrowser, AParams: String;
@@ -22,7 +21,6 @@ begin
   RunCmdFromPath(ABrowser,Format(AParams, [AURL]));
 end;
 
-// Open a document with the default application associated with it in the system
 function OpenDocument(APath: String): Boolean;
 var
   lApp: string;
@@ -32,13 +30,15 @@ begin
     Exit(OpenDocumentWidgetsetImplementation(APath));
 
   Result := True;
-  if not (FileExistsUTF8(APath) or DirectoryExistsUTF8(APath)) then
+  if not (FileExists(APath) or DirectoryExists(APath)) then
     Exit(false);
 
   lApp:=FindFilenameOfCmd('xdg-open'); // Portland OSDL/FreeDesktop standard on Linux
   if lApp='' then
+    // Does not work. Tested in Manjaro Linux + KDE. Could be removed.
     lApp:=FindFilenameOfCmd('kfmclient'); // KDE command
   if lApp='' then
+    // Does this work? Please test somebody.
     lApp:=FindFilenameOfCmd('gnome-open'); // GNOME command
   if lApp='' then
     Exit(False);
@@ -47,3 +47,65 @@ begin
     APath:=QuotedStr(APath);
   RunCmdFromPath(lApp,APath);
 end;
+
+function SelectInFolder(AFullPath: String): Boolean;
+var
+  lApp, DesktopEnv: string;
+  // Parameters for a filename or directory, and for filemanager selection.
+  FileParam, SelParam: string;
+
+  procedure SelectNautilus;
+  begin
+    lApp := 'nautilus';
+    SelParam := '--select ';
+  end;
+
+  procedure SelectDolphin;
+  begin
+    lApp := 'dolphin';
+    SelParam := '--select ';
+  end;
+
+begin
+  if not (FileExists(AFullPath) or DirectoryExists(AFullPath)) then
+    Exit(false);
+  FileParam := AFullPath;
+  SelParam := '';
+  DesktopEnv := GetEnvironmentVariable('XDG_CURRENT_DESKTOP');
+
+  //pcmanfm does not have a --select option i can find but may be another way
+  //caja has a --select option but i cannot work it out.  keeps trying to open file as a path issue
+  //try to get desktop env first.  but could be any file manager... seems like a good order
+  if Pos('GNOME', DesktopEnv) > 0 then
+    SelectNautilus
+  else if Pos('KDE', DesktopEnv) > 0 then
+    SelectDolphin
+  else if FileExists('/usr/bin/nautilus') then
+    SelectNautilus
+  else if FileExists('/usr/bin/dolphin') then
+    SelectDolphin
+  else if FileExists('/usr/bin/thunar') then
+    lApp := 'thunar'                  // Unable to select but opens directory
+  else if FileExists('/usr/bin/nemo') then
+    lApp := 'nemo'
+  else if FileExists('/usr/bin/caja') then
+    // Can't figure out the --select option which help says is there but does not behave
+    lApp := 'caja'
+  else if FileExists('/usr/bin/krusader') then
+  begin
+    // Not possible to select the file but better open the dir in the left pane
+    lApp := 'krusader';
+    SelParam := '--left ';
+    FileParam := ExtractFilePath(AFullPath); // Just the directory
+  end
+  else begin  // No known file manager found. Trying xdg-open for the directory
+    lApp := FindFilenameOfCmd('xdg-open');
+    FileParam := ExtractFilePath(AFullPath);
+  end;
+
+  if (FileParam <> '') and (FileParam[1] <> '"') then
+    FileParam := QuotedStr(FileParam);
+  RunCmdFromPath(lApp, SelParam + FileParam, []);
+  Result := True;
+end;
+
diff --git a/lcl/include/sysenvapis_win.inc b/lcl/include/sysenvapis_win.inc
index e917551024..3ac8d67110 100644
--- a/lcl/include/sysenvapis_win.inc
+++ b/lcl/include/sysenvapis_win.inc
@@ -352,3 +352,11 @@ function OpenDocument(APath: String): Boolean;
 begin
   Result := OpenURL(APath);
 end;
+
+// ToDo: Implement
+// Now just open the folder in system filemanager.
+function SelectInFolder(AFullPath: String): Boolean;
+begin
+  Result := OpenDocument(ExtractFilePath(AFullPath));
+end;
+
diff --git a/lcl/lclintf.pas b/lcl/lclintf.pas
index 3cdee3d10e..0fcf196122 100644
--- a/lcl/lclintf.pas
+++ b/lcl/lclintf.pas
@@ -79,10 +79,19 @@ function GetTickStep: DWord;
 {$ENDIF}
 
 function FindDefaultBrowser(out ABrowser, AParams: String): Boolean;
+
+// Open a given URL with the system's default browser.
 // Spaces in URLs need to be encoded as %20 Read http://www.ietf.org/rfc/rfc1738.txt
 function OpenURL(AURL: String): Boolean;
+
+// Open a document in the system's default application associated with it.
 function OpenDocument(APath: String): Boolean;
 
+// Open a system filemanager and select the given file there.
+// AFullPath contains a directory and a file name.
+// Works also with directory names, then nothing gets selected.
+function SelectInFolder(AFullPath: String): Boolean;
+
 type
   TOpenParamStringProc = function (AString: string): Boolean of object;