diff --git a/TODO.md b/TODO.md
index 99ec936a..c3ae6950 100644
--- a/TODO.md
+++ b/TODO.md
@@ -4,6 +4,8 @@
   var by string and readonly
 - [debug mode](https://docs.python.org/3/library/asyncio-dev.html)
 - `pyotherside.atexit()`
+- way to put sidepane back to auto-sizing (snap)
+- better look for arrows when sidepane collapsed
 
 ideas
 (^/v) messages unread + messages still sending
diff --git a/src/qml/SidePane/RoomDelegate.qml b/src/qml/SidePane/RoomDelegate.qml
index 6f63552c..5f67459c 100644
--- a/src/qml/SidePane/RoomDelegate.qml
+++ b/src/qml/SidePane/RoomDelegate.qml
@@ -13,7 +13,7 @@ MouseArea {
 
     HRowLayout {
         width: parent.width
-        spacing: sidePane.normalSpacing
+        spacing: sidePane.collapsed ? 0 : sidePane.normalSpacing
 
         HAvatar {
             id: roomAvatar
diff --git a/src/qml/SidePane/RoomList.qml b/src/qml/SidePane/RoomList.qml
index 1f07fd1a..cfa23f62 100644
--- a/src/qml/SidePane/RoomList.qml
+++ b/src/qml/SidePane/RoomList.qml
@@ -8,7 +8,7 @@ HListView {
     property string category: ""
 
     id: roomList
-    spacing: sidePane.normalSpacing
+    spacing: sidePane.collapsed ? 0 : sidePane.normalSpacing
 
     model: SortFilterProxyModel {
         sourceModel: rooms
diff --git a/src/qml/SidePane/SidePane.qml b/src/qml/SidePane/SidePane.qml
index 7ae95211..166d228d 100644
--- a/src/qml/SidePane/SidePane.qml
+++ b/src/qml/SidePane/SidePane.qml
@@ -16,9 +16,9 @@ HRectangle {
             Layout.fillHeight: true
 
             spacing: collapsed ? 0 : normalSpacing * 3
-            topMargin: normalSpacing
-            bottomMargin: normalSpacing
-            Layout.leftMargin: normalSpacing
+            topMargin: collapsed ? 0 : normalSpacing
+            bottomMargin: topMargin
+            Layout.leftMargin: topMargin
 
             Behavior on spacing {
                 NumberAnimation { duration: HStyle.animationDuration }