diff --git a/components/tvplanit/source/vpevnteditdlg.pas b/components/tvplanit/source/vpevnteditdlg.pas
index 936b00efb..d64440d07 100644
--- a/components/tvplanit/source/vpevnteditdlg.pas
+++ b/components/tvplanit/source/vpevnteditdlg.pas
@@ -619,12 +619,11 @@ end;
 procedure TDlgEventEdit.FormShow(Sender: TObject);
 begin
   PositionControls;
-  (*
-  {$IFDEF LCL}
-  ScaleDPI(Self, DesigntimeDPI);
-  {$ENDIF}
-    *)
   DescriptionEdit.SetFocus;
+ {$IFNDEF MSWINDOWS}
+  if not Assigned(FDatastore.OnPlaySound) then
+    SoundFinderBtn.Hide;
+ {$ENDIF}
 end;
 {=====}
 
diff --git a/components/tvplanit/source/vpwavdlg.pas b/components/tvplanit/source/vpwavdlg.pas
index c283fecdd..5d6935e60 100644
--- a/components/tvplanit/source/vpwavdlg.pas
+++ b/components/tvplanit/source/vpwavdlg.pas
@@ -166,7 +166,8 @@ begin
   Label4.Caption := RSNothingToSelectFrom;
   if DingPath = '' then begin
     CBDefault.Checked := true;
-    ShellTreeView.Path := MediaFolder;
+    if (MediaFolder <> '') and DirectoryExists(MediaFolder) then
+      ShellTreeView.Path := MediaFolder;
   end else
   if FileExists(DingPath) then begin
     ShellTreeview.Path := ExtractFileDir(DingPath);