diff --git a/CHANGELOG.md b/CHANGELOG.md
index 30d610ec..ecbb486e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 > Committed but unreleased changes are put here, at the top. Older releases are detailed chronologically below.
 
+## 2.22.8 (2024-10-10)
+
+#### Changed
+
+- `nested-grid`: Adjust flex-child style & internal layering
+
 ## 2.22.6 (2024-10-08)
 
 #### Fixed
diff --git a/src/re_com/nested_grid.cljs b/src/re_com/nested_grid.cljs
index 5d4752f9..4ab5a6f4 100644
--- a/src/re_com/nested_grid.cljs
+++ b/src/re_com/nested_grid.cljs
@@ -1107,18 +1107,18 @@
                                                              :justify-content  :end
                                                              :height           25
                                                              :background-color :white
-                                                             :z-index          3}
+                                                             :z-index          2}
                                                             (when sticky?
                                                               {:position :sticky
                                                                :top      sticky-top}))}
                                         [box/v-box {:align    :center
                                                     :justify  :center
-                                                    :style    {:z-index          4
-                                                               :position         :sticky
+                                                    :style    {:position         :sticky
                                                                :background-color :white
                                                                :right            0
                                                                :width            25
-                                                               :height           25}
+                                                               :height           25
+                                                               :margin-right     10}
                                                     :children [export-button]}]]
             outer-grid-container       [:div
                                         (themed ::outer-grid-container
@@ -1180,7 +1180,7 @@
         [:div (themed ::wrapper
                 {:style (merge {:flex-direction :column}
                                (when-not sticky?
-                                 (merge {:flex    1
+                                 (merge {:flex    "0 0 auto"
                                          :display :flex}
                                         (when remove-empty-column-space?
                                           {:max-width :fit-content})
diff --git a/src/re_com/theme/default.cljs b/src/re_com/theme/default.cljs
index bb22a63c..3d2a141d 100644
--- a/src/re_com/theme/default.cljs
+++ b/src/re_com/theme/default.cljs
@@ -212,13 +212,15 @@
      :text-align       "left"
      :font-size        "13px"
      :white-space      "nowrap"
-     :border-right     "thin solid #ccc"
+     :border-left      "thin solid #ccc"
      :border-bottom    "thin solid #ccc"}))
 
 (defmethod main ::nested-grid/row-header-wrapper
   [props {{:keys [edge]} :state}]
   (update props :style merge
           row-header-wrapper-main
+          (when (contains? edge :right)
+            {:border-right "thin solid #aaa"})
           (when (contains? edge :left)
             {:border-left "thin solid #aaa"})
           (when (contains? edge :bottom)