3 files changed, 4 insertions, 2 deletions
diff --git a/src/virtualkeyboard/content/components/Keyboard.qml b/src/virtualkeyboard/content/components/Keyboard.qml
index c4e28284..a24fee30 100644
--- a/src/virtualkeyboard/content/components/Keyboard.qml
+++ b/src/virtualkeyboard/content/components/Keyboard.qml
@@ -471,7 +471,7 @@ Item {
         Connections {
             target: wordCandidateView.model ? wordCandidateView.model : null
             onActiveItemChanged: wordCandidateView.currentIndex = index
-            onItemSelected: soundEffect.play(wordCandidateView.currentItem.soundEffect)
+            onItemSelected: if (wordCandidateView.currentItem) soundEffect.play(wordCandidateView.currentItem.soundEffect)
         }
         Loader {
             sourceComponent: style.selectionListBackground
diff --git a/src/virtualkeyboard/declarativeselectionlistmodel.cpp b/src/virtualkeyboard/declarativeselectionlistmodel.cpp
index a124d1c1..de8599e2 100644
--- a/src/virtualkeyboard/declarativeselectionlistmodel.cpp
+++ b/src/virtualkeyboard/declarativeselectionlistmodel.cpp
@@ -191,7 +191,7 @@ QHash<int,QByteArray> DeclarativeSelectionListModel::roleNames() const
 void DeclarativeSelectionListModel::selectItem(int index)
 {
     Q_D(DeclarativeSelectionListModel);
-    if (d->dataSource) {
+    if (index >= 0 && index < d->rowCount && d->dataSource) {
         emit itemSelected(index);
         d->dataSource->selectionListItemSelected(d->type, index);
     }
diff --git a/src/virtualkeyboard/styles/SelectionListItem.qml b/src/virtualkeyboard/styles/SelectionListItem.qml
index 74447c33..e196d839 100644
--- a/src/virtualkeyboard/styles/SelectionListItem.qml
+++ b/src/virtualkeyboard/styles/SelectionListItem.qml
@@ -44,6 +44,8 @@ Item {
         anchors.fill: parent
         hoverEnabled: true
         onClicked: {
+            if (index === -1)
+                return
             selectionListItem.ListView.view.currentIndex = index
             selectionListItem.ListView.view.model.selectItem(index)
         }