diff --git a/components/ideintf/frmselectprops.lfm b/components/ideintf/frmselectprops.lfm
index 7e83652f2f..2f30610c26 100644
--- a/components/ideintf/frmselectprops.lfm
+++ b/components/ideintf/frmselectprops.lfm
@@ -41,6 +41,7 @@ object SelectPropertiesForm: TSelectPropertiesForm
         Align = alTop
         BorderSpacing.Around = 6
         Caption = '&Properties'
+        FocusControl = LBProperties
         Layout = tlCenter
         ParentColor = False
       end
@@ -55,10 +56,8 @@ object SelectPropertiesForm: TSelectPropertiesForm
         MultiSelect = True
         OnClick = LBPropertiesClick
         OnDblClick = LBPropertiesDblClick
-        ScrollWidth = 238
         Sorted = True
         TabOrder = 0
-        TopIndex = -1
       end
     end
     object PComponents: TPanel
@@ -81,6 +80,7 @@ object SelectPropertiesForm: TSelectPropertiesForm
         Align = alTop
         BorderSpacing.Around = 6
         Caption = 'Co&mponents'
+        FocusControl = LBComponents
         Layout = tlCenter
         ParentColor = False
       end
@@ -93,10 +93,8 @@ object SelectPropertiesForm: TSelectPropertiesForm
         BorderSpacing.Around = 6
         ItemHeight = 0
         OnSelectionChange = LBComponentsSelectionChange
-        ScrollWidth = 215
         Sorted = True
         TabOrder = 0
-        TopIndex = -1
       end
     end
     object VSplitter: TSplitter
@@ -132,9 +130,10 @@ object SelectPropertiesForm: TSelectPropertiesForm
       Left = 10
       Height = 15
       Top = 3
-      Width = 109
+      Width = 124
       BorderSpacing.Around = 6
       Caption = '&Selected Properties'
+      FocusControl = LBSelected
       ParentColor = False
     end
     object LBSelected: TListBox
@@ -152,9 +151,7 @@ object SelectPropertiesForm: TSelectPropertiesForm
       BorderSpacing.Around = 6
       ItemHeight = 0
       MultiSelect = True
-      ScrollWidth = 390
       TabOrder = 0
-      TopIndex = -1
     end
     object BAdd: TButton
       AnchorSideTop.Control = LBSelected
diff --git a/components/ideintf/frmselectprops.pas b/components/ideintf/frmselectprops.pas
index de27953401..ead4ba136f 100644
--- a/components/ideintf/frmselectprops.pas
+++ b/components/ideintf/frmselectprops.pas
@@ -116,8 +116,9 @@ begin
   BClear.Caption:=oisClear;
   BOK.Caption:=oisOk;
   BCancel.Caption:=oiStdActDataSetCancel1Hint;
-  LComponents.Caption:=oisComponents;
-  LProperties.Caption:=oisProperties;
+  LComponents.Caption:=oisBtnComponents;
+  LProperties.Caption:=oisBtnProperties;
+  LBSelected.Caption:=oisSelectedProperties;
   IDEDialogLayoutList.ApplyLayout(Self,485,460);
 end;
 
diff --git a/components/ideintf/objectinspector.lfm b/components/ideintf/objectinspector.lfm
index 59e2b44e4b..f8a31bd0c7 100644
--- a/components/ideintf/objectinspector.lfm
+++ b/components/ideintf/objectinspector.lfm
@@ -11,8 +11,8 @@ object ObjectInspectorDlg: TObjectInspectorDlg
   LCLVersion = '1.1'
   object StatusBar: TStatusBar
     Left = 0
-    Height = 22
-    Top = 647
+    Height = 20
+    Top = 649
     Width = 300
     Panels = <    
       item
@@ -48,13 +48,13 @@ object ObjectInspectorDlg: TObjectInspectorDlg
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = FilterLabel
       AnchorSideTop.Side = asrCenter
-      Left = 71
-      Height = 24
-      Top = 2
-      Width = 200
+      Left = 87
+      Height = 23
+      Top = 3
+      Width = 184
       UseFormActivate = True
       ButtonWidth = 23
-      NumGlyphs = 0
+      NumGlyphs = 1
       Anchors = [akTop, akLeft, akRight]
       BorderSpacing.Left = 5
       MaxLength = 0
@@ -64,8 +64,9 @@ object ObjectInspectorDlg: TObjectInspectorDlg
       Left = 3
       Height = 15
       Top = 7
-      Width = 63
-      Caption = 'Components'
+      Width = 79
+      Caption = 'Co&mponents'
+      FocusControl = CompFilterEdit
       ParentColor = False
     end
   end
diff --git a/components/ideintf/objectinspector.pp b/components/ideintf/objectinspector.pp
index f1ba5d63ed..2fd6853238 100644
--- a/components/ideintf/objectinspector.pp
+++ b/components/ideintf/objectinspector.pp
@@ -3933,7 +3933,7 @@ begin
 
   Caption := oisObjectInspector;
   StatusBar.SimpleText := oisAll;
-  FilterLabel.Caption := oisComponents;
+  FilterLabel.Caption := oisBtnComponents;
   MainPopupMenu.Images := IDEImages.Images_16;
 
   AddPopupMenuItem(AddToFavoritesPopupMenuItem,nil,'AddToFavoritePopupMenuItem',
diff --git a/components/ideintf/objinspstrconsts.pas b/components/ideintf/objinspstrconsts.pas
index dbc4b2cdfe..a9880ccf0a 100644
--- a/components/ideintf/objinspstrconsts.pas
+++ b/components/ideintf/objinspstrconsts.pas
@@ -48,9 +48,9 @@ resourcestring
   oisArray = 'Array';
   oisRecord = 'Record';
   oisInterface = 'Interface';
-
-  oisProperties='Properties';
-  oisEvents='Events';
+  oisProperties = 'Properties';
+  oisBtnProperties = '&Properties';
+  oisEvents = 'Events';
   oisFavorites = 'Favorites';
   oisRestricted = 'Restricted';
   
@@ -328,8 +328,10 @@ resourcestring
   oiStdActDataSetEditHint = 'Edit';
   oiStdActDataSetPostHint = 'Post';
   oiStdActDataSetCancel1Hint = 'Cancel';
-  oisComponents = 'Components';
+  //oisComponents = 'Components';
+  oisBtnComponents = 'Co&mponents';
   oiStdActDataSetRefreshHint = 'Refresh';
+  oisSelectedProperties = '&Selected Properties';
   
   oisStdActionListEditor = 'Standard Action Classes';
   oisStdActionListEditorClass = 'Available Action Classes:';