diff --git a/Pilz.Net/Api/Server/BaseHandler.cs b/Pilz.Net/Api/Server/BaseHandler.cs
index 745a5f2..b47c797 100644
--- a/Pilz.Net/Api/Server/BaseHandler.cs
+++ b/Pilz.Net/Api/Server/BaseHandler.cs
@@ -52,10 +52,19 @@ public abstract class BaseHandler<TEntity, TUpdateMsg>(IApiServer server)
 
     public virtual ApiResult Delete(int id)
     {
-        server.Manager.Delete<TEntity>(id, true);
+        if (server.Manager.Find<TEntity>(id, out var entity) && OnDelete(entity) is ApiResult result)
+            return result;
         return ApiResult.Ok();
     }
 
+    protected virtual ApiResult? OnDelete(TEntity entity)
+    {
+        server.Manager.Delete(entity, true);
+        return null;
+    }
+
+    protected virtual ApiResult? OnSave(TEntity entity, TUpdateMsg update)
+
     protected virtual TEntity CreateNewEntity(TUpdateMsg msg)
     {
         return Activator.CreateInstance<TEntity>();
diff --git a/Pilz.UI.Telerik/Dialogs/RadFlyoutBase.cs b/Pilz.UI.Telerik/Dialogs/RadFlyoutBase.cs
index 142f168..c7f9218 100644
--- a/Pilz.UI.Telerik/Dialogs/RadFlyoutBase.cs
+++ b/Pilz.UI.Telerik/Dialogs/RadFlyoutBase.cs
@@ -237,6 +237,11 @@ public partial class RadFlyoutBase : UserControl
                 frm.AutoSize = true;
                 frm.AutoSizeMode = AutoSizeMode.GrowAndShrink;
             }
+            else
+            {
+                frm.ClientSize = Size;
+            }
+        }
 
             frm.Shown += Form_Shown;
         }