diff --git a/GUIs.Common/ObjectPropertyDialog/ctrlObjectPropertyDialog.vb b/GUIs.Common/ObjectPropertyDialog/ctrlObjectPropertyDialog.vb
index 74f733d5..05ea3d6d 100644
--- a/GUIs.Common/ObjectPropertyDialog/ctrlObjectPropertyDialog.vb
+++ b/GUIs.Common/ObjectPropertyDialog/ctrlObjectPropertyDialog.vb
@@ -21,6 +21,7 @@ Public Class ctrlObjectPropertyDialog
     Private Property Client As Client
     Private Property Environment As Environment
     Private Property ObjectId As Long
+    Private Property HostForm As Form
 
     Private ReadOnly Changes As New Dictionary(Of String, Object)
 
@@ -40,6 +41,7 @@ Public Class ctrlObjectPropertyDialog
     Public Sub Initialize(pLogConfig As LogConfig, pHostForm As Form, pClient As Client, pEnv As Environment)
         LogConfig = pLogConfig
         Logger = pLogConfig.GetLogger()
+        HostForm = pHostForm
         ErrorHandler = New BaseErrorHandler(pLogConfig, pHostForm)
         ControlManager = New AttributeControls(pLogConfig, pEnv, pClient)
 
@@ -91,7 +93,7 @@ Public Class ctrlObjectPropertyDialog
         End If
 
         IsLoading = True
-        Dim oLoadingHandle = SplashScreenManager.ShowOverlayForm(Me)
+        Enabled = False
 
         Try
             ObjectId = pObjectId
@@ -131,7 +133,7 @@ Public Class ctrlObjectPropertyDialog
             Logger.Error(ex)
             Return False
         Finally
-            SplashScreenManager.CloseOverlayForm(oLoadingHandle)
+            Enabled = True
             IsLoading = False
         End Try
     End Function