diff --git a/src/add-ons/input_server/devices/keyboard/TMWindow.cpp b/src/add-ons/input_server/devices/keyboard/TMWindow.cpp
index f6d5f6b8a6..324fdbf17b 100644
--- a/src/add-ons/input_server/devices/keyboard/TMWindow.cpp
+++ b/src/add-ons/input_server/devices/keyboard/TMWindow.cpp
@@ -254,7 +254,8 @@ TMView::UpdateList()
 
 		if (!found) {
 			TMListItem *item = new TMListItem(info);
-			fListView->AddItem(item, 0);
+
+			fListView->AddItem(item, item->IsSystemServer() ? fListView->CountItems() : 0);
 			item->fFound = true;
 			changed = true;
 		}