diff --git a/IDE/src/ui/AutoComplete.bf b/IDE/src/ui/AutoComplete.bf
index 2a7bfe8c..60366e76 100644
--- a/IDE/src/ui/AutoComplete.bf
+++ b/IDE/src/ui/AutoComplete.bf
@@ -671,9 +671,19 @@ namespace IDE.ui
 					return;
                 int32 newSelection = mSelectIdx + dir;
 				if (newSelection < 0)
-					newSelection = (.)mEntryList.Count - 1;
+				{
+					if (dir == -1)
+						newSelection = (.)mEntryList.Count - 1;
+					else
+						newSelection = 0;
+				}
 				else if (newSelection >= mEntryList.Count)
-					newSelection = 0;
+				{
+					if (dir == 1)
+						newSelection = 0;
+					else
+						newSelection = (.)mEntryList.Count - 1;
+				}
                 
                 if (mEntryList[newSelection].mShowIdx != -1)
                     Select(newSelection);
diff --git a/IDE/src/ui/SourceEditWidgetContent.bf b/IDE/src/ui/SourceEditWidgetContent.bf
index 4f3f153d..8121fd92 100644
--- a/IDE/src/ui/SourceEditWidgetContent.bf
+++ b/IDE/src/ui/SourceEditWidgetContent.bf
@@ -3419,10 +3419,10 @@ namespace IDE.ui
 	                        int32 moveDir = 0;
 	                        switch (keyCode)
 	                        {
-	                        case KeyCode.Up: moveDir = -1; break;
-	                        case KeyCode.Down: moveDir = 1; break;
-	                        case KeyCode.PageUp: moveDir = -pageSize; break;
-	                        case KeyCode.PageDown: moveDir = pageSize; break;
+	                        case KeyCode.Up: moveDir = -1;
+	                        case KeyCode.Down: moveDir = 1;
+	                        case KeyCode.PageUp: moveDir = -pageSize;
+	                        case KeyCode.PageDown: moveDir = pageSize;
 							default:
 	                        }
 	                        mAutoComplete.mAutoCompleteListWidget.SelectDirection(moveDir);