diff --git a/src/cfclient/ui/tabs/LogBlockTab.py b/src/cfclient/ui/tabs/LogBlockTab.py
index de4b0408e9..d74764af83 100644
--- a/src/cfclient/ui/tabs/LogBlockTab.py
+++ b/src/cfclient/ui/tabs/LogBlockTab.py
@@ -176,6 +176,7 @@ def __init__(self, view, parent=None):
     def add_block(self, block, connected_ts):
         self._nodes.append(LogBlockItem(block, self, connected_ts))
         self.layoutChanged.emit()
+        self._nodes.sort(key=lambda conf: conf.name.lower())
 
     def refresh(self):
         """Force a refresh of the view though the model"""
diff --git a/src/cfclient/ui/tabs/LogTab.py b/src/cfclient/ui/tabs/LogTab.py
index 7db1f804d4..ed9785d305 100644
--- a/src/cfclient/ui/tabs/LogTab.py
+++ b/src/cfclient/ui/tabs/LogTab.py
@@ -60,6 +60,8 @@ def __init__(self, tabWidget, helper, *args):
 
         # Init the tree widget
         self.logTree.setHeaderLabels(['Name', 'ID', 'Unpack', 'Storage'])
+        self.logTree.setSortingEnabled(True)
+        self.logTree.sortItems(0, Qt.AscendingOrder)
 
         self.cf.connected.add_callback(self.connectedSignal.emit)
         self.connectedSignal.connect(self.connected)
@@ -90,4 +92,3 @@ def connected(self, linkURI):
                 groupItem.addChild(item)
 
             self.logTree.addTopLevelItem(groupItem)
-            self.logTree.expandItem(groupItem)
diff --git a/src/cfclient/ui/tabs/ParamTab.py b/src/cfclient/ui/tabs/ParamTab.py
index a3c9789158..ef7f361ca8 100644
--- a/src/cfclient/ui/tabs/ParamTab.py
+++ b/src/cfclient/ui/tabs/ParamTab.py
@@ -253,7 +253,6 @@ def __init__(self, tabWidget, helper, *args):
 
     def _connected(self, link_uri):
         self._model.set_toc(self.cf.param.toc.toc, self.helper.cf)
-        self.paramTree.expandAll()
 
     def _disconnected(self, link_uri):
         self._model.beginResetModel()