diff --git a/modules/game_console/console.lua b/modules/game_console/console.lua
index 559c0d08..af552c81 100644
--- a/modules/game_console/console.lua
+++ b/modules/game_console/console.lua
@@ -148,7 +148,7 @@ local function onChannelList(channelList)
     local channelId = v[1]
     local channelName = v[2]
 
-    if channelId ~= 0 and #channelName > 0 then
+    if #channelName > 0 then
       local label = createWidget('ChannelListLabel', channelListPanel)
       label.channelId = channelId
       label:setText(channelName)
diff --git a/modules/game_hotkeys/hotkeys_manager.lua b/modules/game_hotkeys/hotkeys_manager.lua
index 22cc4906..8d9e1f77 100644
--- a/modules/game_hotkeys/hotkeys_manager.lua
+++ b/modules/game_hotkeys/hotkeys_manager.lua
@@ -286,7 +286,7 @@ end
 function HotkeysManager.call(keyCombo)
   if g_game.isOnline() then
     local hotKey = hotkeyList[keyCombo]
-    if hotKey.itemId == nil and hotKey.value ~= '' then
+    if hotKey ~= nil and hotKey.itemId == nil and hotKey.value ~= '' then
       if hotKey.autoSend then
         g_game.talk(hotKey.value)
       else
diff --git a/modules/game_hotkeys/hotkeys_manager.otui b/modules/game_hotkeys/hotkeys_manager.otui
index 122b044b..28f94684 100644
--- a/modules/game_hotkeys/hotkeys_manager.otui
+++ b/modules/game_hotkeys/hotkeys_manager.otui
@@ -22,13 +22,22 @@ MainWindow
     anchors.left: parent.left
     anchors.right: parent.right
     anchors.top: parent.top
-
+    
+  VerticalScrollBar
+    id: currentHotkeysScrollBar
+    height: 150
+    anchors.top: parent.top
+    anchors.right: parent.right
+    step: 14
+    pixels-scroll: true
+    
   TextList
     id: currentHotkeys
+    vertical-scrollbar: currentHotkeysScrollBar    
     anchors.left: parent.left
-    anchors.right: parent.right
-    anchors.top: prev.bottom
-    height: 150
+    anchors.right: prev.left
+    anchors.top: prev.top
+    anchors.bottom: prev.bottom
     margin-top: 2
     padding: 1
     focusable: false