diff --git a/components/thtmlport/demo_src/demounit.pas b/components/thtmlport/demo_src/demounit.pas
index 985632392..7ba6f672c 100755
--- a/components/thtmlport/demo_src/demounit.pas
+++ b/components/thtmlport/demo_src/demounit.pas
@@ -245,6 +245,7 @@ procedure TForm1.OpenFileClick(Sender: TObject);
 begin
 if Viewer.CurrentFile <> '' then
   OpenDialog.InitialDir := ExtractFilePath(Viewer.CurrentFile);
+OpenDialog.Filter := 'HTML Files (*.htm,*.html)|*.htm;*.html';  //might have changed
 if OpenDialog.Execute then
   begin
   Update;  
diff --git a/components/thtmlport/demo_src/fdemunit.pas b/components/thtmlport/demo_src/fdemunit.pas
index 5b726a093..fea09a720 100755
--- a/components/thtmlport/demo_src/fdemunit.pas
+++ b/components/thtmlport/demo_src/fdemunit.pas
@@ -347,7 +347,9 @@ else OpenDialog.InitialDir := ExtractFilePath(ParamStr(0));
 {$ELSE}  //Don't default to within app bundle.
 else OpenDialog.InitialDir := ExtractFilePath(ParamStr(0)) + '../../../';
 {$ENDIF}
-OpenDialog.FilterIndex := 1;
+//OpenDialog.FilterIndex := 1;  //Form's Filter wasn't right, so set here
+OpenDialog.Filter := 'HTML Files (*.htm,*.html)|*.htm;*.html'+
+                     '|All Files (*.*)|*.*';
 if OpenDialog.Execute then
   begin
   FrameViewer.LoadFromFile(OpenDialog.Filename);