diff --git a/ideintf/propedits.pp b/ideintf/propedits.pp
index f139608254..26b811c561 100644
--- a/ideintf/propedits.pp
+++ b/ideintf/propedits.pp
@@ -39,12 +39,19 @@ unit PropEdits;
 
 interface
 
+{$IFNDEF VER1_0}
+  {$DEFINE EnableSessionProps}
+{$ENDIF}
 {$DEFINE NewListPropEdit}
 
 uses
   Classes, TypInfo, SysUtils, LCLProc, Forms, Controls, GraphType, Graphics,
   StdCtrls, Buttons, ComCtrls, Menus, LCLType, ExtCtrls, LCLIntf, Dialogs,
-  Grids, EditBtn, TextTools, ColumnDlg, ObjInspStrConsts;
+  Grids, EditBtn,
+  {$IFDEF EnableSessionProps}
+  PropertyStorage,
+  {$ENDIF}
+  TextTools, ColumnDlg, ObjInspStrConsts;
 
 const
   MaxIdentLength: Byte = 63;
@@ -6175,6 +6182,10 @@ begin
     TFileDialog, 'Filter', TFileDlgFilterProperty);
   RegisterPropertyEditor(DummyClassForPropTypes.PTypeInfos('AnsiString'),
     TFileNameEdit, 'Filter', TFileDlgFilterProperty);
+  {$IFDEF EnableSessionProps}
+  RegisterPropertyEditor(DummyClassForPropTypes.PTypeInfos('AnsiString'),
+    TCustomPropertyStorage, 'Filename', TFileNamePropertyEditor);
+  {$ENDIF}
 end;
 
 procedure FinalPropEdits;
diff --git a/lcl/xmlpropstorage.pas b/lcl/xmlpropstorage.pas
index 4dab0ad72c..d689d7800d 100644
--- a/lcl/xmlpropstorage.pas
+++ b/lcl/xmlpropstorage.pas
@@ -90,11 +90,13 @@ begin
   If (FXML=Nil) then
     FXML:=TPropStorageXMLConfig.Create(GetXMLFileName);
   Inc(FCount);
+  //debugln('TCustomXMLPropStorage.StorageNeeded ',dbgsname(FXML),' ',dbgs(FXML),' FCount=',dbgs(FCount));
 end;
 
 procedure TCustomXMLPropStorage.FreeStorage;
 begin
   Dec(FCount);
+  //debugln('TCustomXMLPropStorage.FreeStorage ',dbgsname(FXML),' ',dbgs(FXML),' FCount=',dbgs(FCount));
   If (FCount<=0) then
     begin
     FCount:=0;