diff --git a/PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcher.cpp b/PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcher.cpp
index 8d8de4b8f..3d76f54fd 100644
--- a/PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcher.cpp
+++ b/PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcher.cpp
@@ -66,10 +66,8 @@ BOOL CALLBACK VerticalFileSwitcher::run_dlgProc(UINT message, WPARAM wParam, LPA
 				{
 					LPNMITEMACTIVATE lpnmitem = (LPNMITEMACTIVATE) lParam;
 					int i = lpnmitem->iItem;
-
 					if (i == -1)
 					{
-						//::MessageBoxA(NULL, "oh yeh","",MB_OK);
 						::SendMessage(_hParent, WM_COMMAND, IDM_FILE_NEW, 0);
 					}
 					return TRUE;
@@ -78,9 +76,9 @@ BOOL CALLBACK VerticalFileSwitcher::run_dlgProc(UINT message, WPARAM wParam, LPA
 				case NM_CLICK:
 				{
 					LPNMITEMACTIVATE lpnmitem = (LPNMITEMACTIVATE) lParam;
+					int nbItem = ListView_GetItemCount(_fileListView.getHSelf());
 					int i = lpnmitem->iItem;
-
-					if (i == -1)
+					if (i == -1 || i >= nbItem)
 						return TRUE;
 
 					LVITEM item;
@@ -97,9 +95,10 @@ BOOL CALLBACK VerticalFileSwitcher::run_dlgProc(UINT message, WPARAM wParam, LPA
 				{
 					// Switch to the right document
 					LPNMITEMACTIVATE lpnmitem = (LPNMITEMACTIVATE) lParam;
+					int nbItem = ListView_GetItemCount(_fileListView.getHSelf());
 					int i = lpnmitem->iItem;
-					if (i == -1)
-						return TRUE;
+					if (i == -1 || i >= nbItem)
+ 						return TRUE;
 
 					LVITEM item;
 					item.mask = LVIF_PARAM;
@@ -143,7 +142,6 @@ BOOL CALLBACK VerticalFileSwitcher::run_dlgProc(UINT message, WPARAM wParam, LPA
 						case VK_RETURN:
 						{
 							int i = ListView_GetSelectionMark(_fileListView.getHSelf());
-
 							if (i == -1)
 								return TRUE;