matplotlib
diff --git a/‎lib/matplotlib/colorbar.py
Copy file name to clipboardExpand all lines: lib/matplotlib/colorbar.py
+9-3Lines changed: 9 additions & 3 deletions b/‎lib/matplotlib/colorbar.py
Copy file name to clipboardExpand all lines: lib/matplotlib/colorbar.py
+9-3Lines changed: 9 additions & 3 deletions
diff --git a/‎lib/matplotlib/tests/baseline_images/test_colorbar/colorbar_closed_patch.png
Copy file name to clipboard
-227 Bytes b/‎lib/matplotlib/tests/baseline_images/test_colorbar/colorbar_closed_patch.png
Copy file name to clipboard
-227 Bytes
diff --git a/‎lib/matplotlib/tests/test_colorbar.py
Copy file name to clipboardExpand all lines: lib/matplotlib/tests/test_colorbar.py
+14Lines changed: 14 additions & 0 deletions b/‎lib/matplotlib/tests/test_colorbar.py
Copy file name to clipboardExpand all lines: lib/matplotlib/tests/test_colorbar.py
+14Lines changed: 14 additions & 0 deletions
@@ -251,8 +251,14 @@ def __init__(self, parent, userax=True):
             outer_ax = fig.add_axes(parent.get_position())
             # copy the locator if one exists:
             outer_ax._axes_locator = parent._axes_locator
-            # remove the parent from the figure...
-            parent.remove()
+            # if the parent is a child of another axes, swap these...
+            if parent._axes is not None:
+                if parent in parent._axes.child_axes:
+                    parent._axes.add_child_axes(outer_ax)
+                    outer_ax._axes.child_axes.remove(parent)
+            else:
+                # remove the parent from the figure...
+                parent.remove()
         else:
             outer_ax = parent
 
@@ -401,7 +407,7 @@ def __init__(self, ax, cmap=None,
                  extendfrac=None,
                  extendrect=False,
                  label='',
-                 userax=True,
+                 userax=False,
                  ):
         _api.check_isinstance([colors.Colormap, None], cmap=cmap)
         _api.check_in_list(
 
@@ -743,3 +743,17 @@ def test_axes_handles_same_functions(fig_ref, fig_test):
         caxx.set_yticks(np.arange(20))
         caxx.set_yscale('log')
         caxx.set_position([0.92, 0.1, 0.02, 0.7])
+
+
+def test_inset_colorbar_layout():
+    fig, ax = plt.subplots(constrained_layout=True, figsize=(3, 6))
+    pc = ax.imshow(np.arange(100).reshape(10, 10))
+    cax = ax.inset_axes([1.02, 0.1, 0.03, 0.8])
+    cb = fig.colorbar(pc, cax=cax)
+
+    fig.draw_no_output()
+    # make sure this is in the figure. In the colorbar swapping
+    # it was being dropped from the list of children...
+    np.testing.assert_allclose(cb.ax.get_position().bounds,
+                               [0.87, 0.342, 0.0237, 0.315], atol=0.01)
+    assert cb.ax.outer_ax in ax.child_axes