diff --git a/PowerEditor/src/ScitillaComponent/ScintillaEditView.h b/PowerEditor/src/ScitillaComponent/ScintillaEditView.h
index 7ae8662fc..8a6220f51 100644
--- a/PowerEditor/src/ScitillaComponent/ScintillaEditView.h
+++ b/PowerEditor/src/ScitillaComponent/ScintillaEditView.h
@@ -488,29 +488,29 @@ public:
 	
 		
 	void currentLineUp() const {
-		execute(SCI_BEGINUNDOACTION);
-
 		int currentLine = getCurrentLineNumber();
-		if (currentLine == 0)
-			return;
-		currentLine--;
-		execute(SCI_LINETRANSPOSE);
-		execute(SCI_GOTOLINE, currentLine);
-
-		execute(SCI_ENDUNDOACTION);
+		if (currentLine != 0)
+		{
+			execute(SCI_BEGINUNDOACTION);
+			currentLine--;
+			execute(SCI_LINETRANSPOSE);
+			execute(SCI_GOTOLINE, currentLine);
+			execute(SCI_ENDUNDOACTION);
+		}
 	};
 
 	void currentLineDown() const {
-		execute(SCI_BEGINUNDOACTION);
+		
 
 		int currentLine = getCurrentLineNumber();
-		if (currentLine == (execute(SCI_GETLINECOUNT) - 1))
-			return;
-		currentLine++;
-		execute(SCI_GOTOLINE, currentLine);
-		execute(SCI_LINETRANSPOSE);
-
-		execute(SCI_ENDUNDOACTION);
+		if (currentLine != (execute(SCI_GETLINECOUNT) - 1))
+		{
+			execute(SCI_BEGINUNDOACTION);
+			currentLine++;
+			execute(SCI_GOTOLINE, currentLine);
+			execute(SCI_LINETRANSPOSE);
+			execute(SCI_ENDUNDOACTION);
+		}
 	};
 
 	void convertSelectedTextTo(bool Case);
diff --git a/PowerEditor/visual.net/notepadPlus.vcproj b/PowerEditor/visual.net/notepadPlus.vcproj
index 4affacc55..b035a2d30 100644
--- a/PowerEditor/visual.net/notepadPlus.vcproj
+++ b/PowerEditor/visual.net/notepadPlus.vcproj
@@ -573,11 +573,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\resource.h"
+				RelativePath="..\src\ScitillaComponent\resource.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\ScitillaComponent\resource.h"
+				RelativePath="..\src\resource.h"
 				>
 			</File>
 			<File