diff --git a/src/toolbars/ToolDock.cpp b/src/toolbars/ToolDock.cpp
index 69256ff25..c0f532115 100644
--- a/src/toolbars/ToolDock.cpp
+++ b/src/toolbars/ToolDock.cpp
@@ -48,6 +48,9 @@
 #include "../widgets/AButton.h"
 #include "../widgets/Grabber.h"
 
+const ToolBarConfiguration::Position
+   ToolBarConfiguration::UnspecifiedPosition { false };
+
 auto ToolBarConfiguration::FindPlace(const ToolBar *bar) const
    -> Iterator
 {
@@ -56,12 +59,26 @@ auto ToolBarConfiguration::FindPlace(const ToolBar *bar) const
    );
 }
 
+auto ToolBarConfiguration::Find(const ToolBar *bar) const -> Position
+{
+   auto iter = FindPlace(bar);
+   if (iter == end())
+      return UnspecifiedPosition;
+   else
+      return iter->position;
+}
+
 void ToolBarConfiguration::Insert(ToolBar *bar, Position position)
 {
-   if (position >= size() || position == UnspecifiedPosition)
+   if (position == UnspecifiedPosition)
       push_back(bar);
-   else
-      wxArrayPtrVoid::Insert(bar, position);
+   else {
+      auto index = wxArrayPtrVoid::Index(position.rightOf);
+      if (index == wxNOT_FOUND)
+         push_back(bar);
+      else
+         wxArrayPtrVoid::Insert(bar, 1 + index);
+   }
 }
 
 void ToolBarConfiguration::Remove(const ToolBar *bar)
diff --git a/src/toolbars/ToolDock.h b/src/toolbars/ToolDock.h
index f4a7f3b26..a19daeae9 100644
--- a/src/toolbars/ToolDock.h
+++ b/src/toolbars/ToolDock.h
@@ -48,12 +48,46 @@ enum
 class ToolBarConfiguration : public wxArrayPtrVoid
 {
 public:
-   using Position = int;
-   static const Position UnspecifiedPosition = -1;
+   struct Position {
+      ToolBar *rightOf {};
+      // ToolBar *below {};
+      // bool adopt {true};
+      bool valid {true};
+
+      // Default constructor
+      Position() {}
+
+      Position(
+         ToolBar *r /*,
+         ToolBar *b = nullptr,
+         bool shouldAdopt = true */
+      )
+         : rightOf{ r } // , below{ b }, adopt{ shouldAdopt }
+      {}
+
+      // Constructor for the invalid value
+      explicit Position(bool /* dummy */) : valid{ false } {}
+
+      friend inline bool operator ==
+      (const Position &lhs, const Position &rhs)
+      { return lhs.valid == rhs.valid &&
+         (!lhs.valid ||
+          (lhs.rightOf == rhs.rightOf
+           // && lhs.below == rhs.below
+           // && lhs.adopt == rhs.adopt
+         ));
+      }
+
+      friend inline bool operator !=
+      (const Position &lhs, const Position &rhs)
+      { return !(lhs == rhs); }
+   };
+
+   static const Position UnspecifiedPosition;
 
    struct Place {
       ToolBar *pBar {};
-      Position position { UnspecifiedPosition };
+      Position position;
    };
 
    class Iterator
@@ -64,9 +98,13 @@ public:
       const Place *operator -> () const { return &**this; }
       Iterator &operator ++ ()
       {
-         ++mIter;
+         wxASSERT(mIter != mEnd);
+
          // This is a feature:  advance position even at the end
-         ++mPlace.position;
+         mPlace.position.rightOf = mPlace.pBar;
+         // mPlace.position.below = nullptr;
+
+         ++mIter;
          if (mIter != mEnd)
             mPlace.pBar = static_cast<ToolBar*>(*mIter);
          else
@@ -93,7 +131,6 @@ public:
          : mIter(iter)
          , mEnd(end)
       {
-         mPlace.position = 0;
          if (mIter != mEnd)
             mPlace.pBar = static_cast<ToolBar*>(*mIter);
       }
@@ -107,10 +144,7 @@ public:
    Iterator end() const
       { return Iterator { wxArrayPtrVoid::end(), wxArrayPtrVoid::end() }; }
 
-   Position Find(const ToolBar *bar) const
-   {
-      return Index(const_cast<ToolBar*>(bar));
-   }
+   Position Find(const ToolBar *bar) const;
 
    bool Contains(const ToolBar *bar) const
    {
diff --git a/src/toolbars/ToolManager.cpp b/src/toolbars/ToolManager.cpp
index e4b4838d5..8895ba000 100644
--- a/src/toolbars/ToolManager.cpp
+++ b/src/toolbars/ToolManager.cpp
@@ -1344,7 +1344,7 @@ void ToolManager::DoneDragging()
    mDragDock = NULL;
    mDragBar = NULL;
    mPrevDock = NULL;
-   mPrevSlot = -1;
+   mPrevSlot = { ToolBarConfiguration::UnspecifiedPosition };
    mLastPos.x = mBarPos.x = -1;
    mLastPos.y = mBarPos.y = -1;
    mTimer.Stop();