diff --git a/components/onlinepackagemanager/opkman_mainfrm.lfm b/components/onlinepackagemanager/opkman_mainfrm.lfm
index 13340c6ddd..ca1ac0221e 100644
--- a/components/onlinepackagemanager/opkman_mainfrm.lfm
+++ b/components/onlinepackagemanager/opkman_mainfrm.lfm
@@ -407,7 +407,7 @@ object MainFrm: TMainFrm
       TabOrder = 0
       Transparent = True
       object tbOptions: TToolButton
-        Left = 433
+        Left = 431
         Top = 0
         AutoSize = True
         Caption = 'Options'
@@ -465,7 +465,7 @@ object MainFrm: TMainFrm
         ImageIndex = 5
         ParentShowHint = False
         ShowHint = True
-        Style = tbsDropDown
+        Style = tbsButtonDrop
       end
       object tbUpdate: TToolButton
         Left = 211
diff --git a/components/onlinepackagemanager/opkman_mainfrm.pas b/components/onlinepackagemanager/opkman_mainfrm.pas
index 2477599551..4e036d4382 100644
--- a/components/onlinepackagemanager/opkman_mainfrm.pas
+++ b/components/onlinepackagemanager/opkman_mainfrm.pas
@@ -690,10 +690,10 @@ begin
           NeedToRebuild := False;
           if Install(InstallStatus, NeedToRebuild) = mrOk then
           begin
+            SerializablePackages.MarkRuntimePackages;
+            VisualTree.UpdatePackageStates;
             if (InstallStatus = isSuccess) or (InstallStatus = isPartiallyFailed) then
             begin
-              SerializablePackages.MarkRuntimePackages;
-              VisualTree.UpdatePackageStates;
               if NeedToRebuild then
               begin
                 EnableDisableControls(False);