diff --git a/Toolset/palettes/revdatagridlibrary/behaviorsdatagridbuttonbehavior.livecodescript b/Toolset/palettes/revdatagridlibrary/behaviorsdatagridbuttonbehavior.livecodescript
index 05c2e6d8f0..004c0c5628 100644
--- a/Toolset/palettes/revdatagridlibrary/behaviorsdatagridbuttonbehavior.livecodescript
+++ b/Toolset/palettes/revdatagridlibrary/behaviorsdatagridbuttonbehavior.livecodescript
@@ -5759,7 +5759,7 @@ setprop dgProps [pProp] pValue
             show group "dgHorizontalComponents" of me
             _table.RegenerateColumns
             -- set the uEffectiveColumnWidths of group "dgHeader" of group "dgHeaderMask" of group "dgHeaderComponents" of me \
-                  -- to _table.GetEffectiveColumnWidths()
+            -- to _table.GetEffectiveColumnWidths()
             
             ## Set any props that have special settings for table.
             lock messages
@@ -5780,6 +5780,7 @@ setprop dgProps [pProp] pValue
          unlock messages      
          
          ResizeToFit
+         ResetList
          unlock screen
          break
          
@@ -5800,7 +5801,7 @@ setprop dgProps [pProp] pValue
             unlock messages
             put empty into sFormattedHeight
             put empty into sControlHeights
-
+            
             DG2_EnsureRowChainedBehavior
          end if
          break
@@ -5841,7 +5842,7 @@ setprop dgProps [pProp] pValue
       case "scroll when vscrollbar is hidden"
       case "scroll when hscrollbar is hidden"
       case "scroll selections into view"
-
+         
       case "animate actions"
       case "enable swipe"
          lock messages
@@ -5863,13 +5864,13 @@ setprop dgProps [pProp] pValue
             lock messages
             set the dgProps[pProp] of me to pValue
             unlock messages
-
+            
             -- We're setting new template controls. Redraw the list to take these new controls into account.
             DG2_CustomisableControlsClearByName pProp
             RefreshList
          end if
          break
-
+         
       case "alternate row colors"
          lock messages
          set the dgProps[pProp] of me to pValue is true
@@ -6017,7 +6018,7 @@ setprop dgProps [pProp] pValue
             -- Update any customisable controls to take into account the row resize.
             DG2_CustomisableControlsResizeDefaults
             DG2_CustomisableControlsClear
-
+            
             ResetList 
             unlock screen
          end if
diff --git a/notes/bugfix-12400.md b/notes/bugfix-12400.md
new file mode 100644
index 0000000000..d43c511079
--- /dev/null
+++ b/notes/bugfix-12400.md
@@ -0,0 +1 @@
+# Ensure Datagrid refreshes when switching its style from table to form and back to table