diff --git a/Oqtane.Client/Modules/Controls/ModuleMessage.razor b/Oqtane.Client/Modules/Controls/ModuleMessage.razor
index f03eafed..a8488ae6 100644
--- a/Oqtane.Client/Modules/Controls/ModuleMessage.razor
+++ b/Oqtane.Client/Modules/Controls/ModuleMessage.razor
@@ -4,7 +4,7 @@
 
 @if (!string.IsNullOrEmpty(Message))
 {
-    @if (_action == "Alert")
+    @if (_style == MessageStyle.Alert)
     {
         <div class="@_classname alert-dismissible fade show mb-3" role="alert">
             @((MarkupString)Message)
@@ -26,7 +26,7 @@
         </div>
     }
 
-    @if (_action == "Toast")
+    @if (_style == MessageStyle.Toast)
     {
         <div class="app-modulemessage-toast bottom-0 end-0">
             <div class="@_classname alert-dismissible fade show mb-3" role="alert">
@@ -54,7 +54,7 @@
 @code {
     private string _message = string.Empty;
     private string _classname = string.Empty;
-    private string _action = string.Empty;
+    private MessageStyle _style;
 
     [Parameter]
     public string Message { get; set; }
@@ -63,7 +63,7 @@
     public MessageType Type { get; set; }
 
     [Parameter]
-    public string Action { get; set; } // Alert (default) or Toast
+    public MessageStyle Style { get; set; } = MessageStyle.Alert;
 
     [Parameter]
     public RenderModeBoundary Parent { get; set; }
@@ -74,11 +74,10 @@
         if (!string.IsNullOrEmpty(_message))
         {
             _classname = GetMessageType(Type);
-            _action = Action;
-            if (string.IsNullOrEmpty(_action)) _action = "Toast"; // default
+            _style = Style;
             if (Type == MessageType.Error)
             {
-                _action = "Alert"; // errors should always be displayed as alerts
+                _style = MessageStyle.Alert; // errors should always be displayed as alerts
             }
         }
     }
diff --git a/Oqtane.Client/Modules/Enums/MessageStyle.cs b/Oqtane.Client/Modules/Enums/MessageStyle.cs
new file mode 100644
index 00000000..dfabe13b
--- /dev/null
+++ b/Oqtane.Client/Modules/Enums/MessageStyle.cs
@@ -0,0 +1,8 @@
+namespace Oqtane.Modules
+{
+    public enum MessageStyle
+    {
+        Alert,
+        Toast
+    }
+}
diff --git a/Oqtane.Client/Modules/MessageType.cs b/Oqtane.Client/Modules/Enums/MessageType.cs
similarity index 100%
rename from Oqtane.Client/Modules/MessageType.cs
rename to Oqtane.Client/Modules/Enums/MessageType.cs
diff --git a/Oqtane.Client/Modules/ModuleBase.cs b/Oqtane.Client/Modules/ModuleBase.cs
index 979e2300..aaf16cf6 100644
--- a/Oqtane.Client/Modules/ModuleBase.cs
+++ b/Oqtane.Client/Modules/ModuleBase.cs
@@ -379,17 +379,17 @@ namespace Oqtane.Modules
 
         public void AddModuleMessage(string message, MessageType type, string position)
         {
-            AddModuleMessage(message, type, "top", "");
+            AddModuleMessage(message, type, position, MessageStyle.Alert);
         }
 
-        public void AddModuleMessage(string message, string action, MessageType type)
+        public void AddModuleMessage(string message, MessageType type, MessageStyle style)
         {
-            AddModuleMessage(message, type, "top", action);
+            AddModuleMessage(message, type, "top", style);
         }
 
-        public void AddModuleMessage(string message, MessageType type, string position, string action)
+        public void AddModuleMessage(string message, MessageType type, string position, MessageStyle style)
         {
-            RenderModeBoundary.AddModuleMessage(message, type, position, action);
+            RenderModeBoundary.AddModuleMessage(message, type, position, style);
         }
 
         public void ClearModuleMessage()
diff --git a/Oqtane.Client/UI/RenderModeBoundary.razor b/Oqtane.Client/UI/RenderModeBoundary.razor
index a0841974..9289e5a0 100644
--- a/Oqtane.Client/UI/RenderModeBoundary.razor
+++ b/Oqtane.Client/UI/RenderModeBoundary.razor
@@ -12,7 +12,7 @@
             {
                 @if (!string.IsNullOrEmpty(_messageContent) && _messagePosition == "top")
                 {
-                    <ModuleMessage Message="@_messageContent" Type="@_messageType" Parent="@this" Action="@_action" />
+                    <ModuleMessage Message="@_messageContent" Type="@_messageType" Parent="@this" Style="@_messageStyle" />
                 }
                 @DynamicComponent
                 @if (_progressIndicator)
@@ -21,7 +21,7 @@
                 }
                 @if (!string.IsNullOrEmpty(_messageContent) && _messagePosition == "bottom")
                 {
-                    <ModuleMessage Message="@_messageContent" Type="@_messageType" Parent="@this" Action="@_action" />
+                    <ModuleMessage Message="@_messageContent" Type="@_messageType" Parent="@this" Style="@_messageStyle" />
                 }
             }
         }
@@ -45,7 +45,7 @@
     private string _messageContent;
     private MessageType _messageType;
     private string _messagePosition;
-    private string _action;
+    private MessageStyle _messageStyle;
     private bool _progressIndicator = false;
     private string _error;
 
@@ -88,6 +88,7 @@
                     _messageContent = string.Format(Localizer["Error.Module.InvalidName"], Utilities.GetTypeNameLastSegment(ModuleState.ModuleType, 0));
                     _messageType = MessageType.Error;
                     _messagePosition = "top";
+                    _messageStyle = MessageStyle.Alert;
                 }
             }
             else
@@ -95,6 +96,7 @@
                 _messageContent = string.Format(Localizer["Error.Module.InvalidType"], ModuleState.ModuleDefinitionName);
                 _messageType = MessageType.Error;
                 _messagePosition = "top";
+                _messageStyle = MessageStyle.Alert;
             }
         }
     }
@@ -106,22 +108,22 @@
 
     public void AddModuleMessage(string message, MessageType type, string position)
     {
-        AddModuleMessage(message, type, "top", "");
+        AddModuleMessage(message, type, position, MessageStyle.Alert);
     }
 
-    public void AddModuleMessage(string message, string action, MessageType type)
+    public void AddModuleMessage(string message, MessageType type, MessageStyle style)
     {
-        AddModuleMessage(message, type, "top", action);
+        AddModuleMessage(message, type, "top", style);
     }
 
-    public void AddModuleMessage(string message, MessageType type, string position, string action)
+    public void AddModuleMessage(string message, MessageType type, string position, MessageStyle style)
     {
-        if (message != _messageContent || type != _messageType || position != _messagePosition || action != _action)
+        if (message != _messageContent || type != _messageType || position != _messagePosition || style != _messageStyle)
         {
             _messageContent = message;
             _messageType = type;
             _messagePosition = position;
-            _action = action;
+            _messageStyle = style;
             _progressIndicator = false;
 
             StateHasChanged();