diff --git a/apps/bsatool/CMakeLists.txt b/apps/bsatool/CMakeLists.txt
index 27baff815..19c9558cf 100644
--- a/apps/bsatool/CMakeLists.txt
+++ b/apps/bsatool/CMakeLists.txt
@@ -18,3 +18,9 @@ if (BUILD_WITH_CODE_COVERAGE)
   add_definitions (--coverage)
   target_link_libraries(bsatool gcov)
 endif()
+
+if (MSVC)
+	if (CMAKE_VERSION VERSION_GREATER 3.8)
+		set_target_properties(bsatool PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "$(TargetDir)")
+	endif (CMAKE_VERSION VERSION_GREATER 3.8)
+endif (MSVC)
\ No newline at end of file
diff --git a/apps/esmtool/CMakeLists.txt b/apps/esmtool/CMakeLists.txt
index 1d5e662d8..b0c67d8fa 100644
--- a/apps/esmtool/CMakeLists.txt
+++ b/apps/esmtool/CMakeLists.txt
@@ -21,3 +21,9 @@ if (BUILD_WITH_CODE_COVERAGE)
   add_definitions (--coverage)
   target_link_libraries(esmtool gcov)
 endif()
+
+if (MSVC)
+	if (CMAKE_VERSION VERSION_GREATER 3.8)
+		set_target_properties(esmtool PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "$(TargetDir)")
+	endif (CMAKE_VERSION VERSION_GREATER 3.8)
+endif (MSVC)
\ No newline at end of file
diff --git a/apps/essimporter/CMakeLists.txt b/apps/essimporter/CMakeLists.txt
index 93f53d0e8..a7c25ca2e 100644
--- a/apps/essimporter/CMakeLists.txt
+++ b/apps/essimporter/CMakeLists.txt
@@ -46,3 +46,9 @@ endif()
 if (WIN32)
   INSTALL(TARGETS openmw-essimporter RUNTIME DESTINATION ".")
 endif(WIN32)
+
+if (MSVC)
+	if (CMAKE_VERSION VERSION_GREATER 3.8)
+		set_target_properties(openmw-essimporter PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "$(TargetDir)")
+	endif (CMAKE_VERSION VERSION_GREATER 3.8)
+endif (MSVC)
\ No newline at end of file
diff --git a/apps/launcher/CMakeLists.txt b/apps/launcher/CMakeLists.txt
index 8cbe18d51..5d70aa917 100644
--- a/apps/launcher/CMakeLists.txt
+++ b/apps/launcher/CMakeLists.txt
@@ -110,4 +110,8 @@ if (BUILD_WITH_CODE_COVERAGE)
   target_link_libraries(openmw-launcher gcov)
 endif()
 
-
+if (MSVC)
+	if (CMAKE_VERSION VERSION_GREATER 3.8)
+		set_target_properties(openmw-launcher PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "$(TargetDir)")
+	endif (CMAKE_VERSION VERSION_GREATER 3.8)
+endif (MSVC)
\ No newline at end of file
diff --git a/apps/mwiniimporter/CMakeLists.txt b/apps/mwiniimporter/CMakeLists.txt
index 4bd661685..071137556 100644
--- a/apps/mwiniimporter/CMakeLists.txt
+++ b/apps/mwiniimporter/CMakeLists.txt
@@ -33,3 +33,9 @@ if (BUILD_WITH_CODE_COVERAGE)
   add_definitions (--coverage)
   target_link_libraries(openmw-iniimporter gcov)
 endif()
+
+if (MSVC)
+	if (CMAKE_VERSION VERSION_GREATER 3.8)
+		set_target_properties(openmw-iniimporter PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "$(TargetDir)")
+	endif (CMAKE_VERSION VERSION_GREATER 3.8)
+endif (MSVC)
\ No newline at end of file
diff --git a/apps/niftest/CMakeLists.txt b/apps/niftest/CMakeLists.txt
index d7f0200d2..efe440ae7 100644
--- a/apps/niftest/CMakeLists.txt
+++ b/apps/niftest/CMakeLists.txt
@@ -17,3 +17,9 @@ if (BUILD_WITH_CODE_COVERAGE)
   add_definitions (--coverage)
   target_link_libraries(niftest gcov)
 endif()
+
+if (MSVC)
+	if (CMAKE_VERSION VERSION_GREATER 3.8)
+		set_target_properties(niftest PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "$(TargetDir)")
+	endif (CMAKE_VERSION VERSION_GREATER 3.8)
+endif (MSVC)
\ No newline at end of file
diff --git a/apps/opencs/CMakeLists.txt b/apps/opencs/CMakeLists.txt
index fc8930b71..65c1d8ed8 100644
--- a/apps/opencs/CMakeLists.txt
+++ b/apps/opencs/CMakeLists.txt
@@ -260,6 +260,10 @@ if (MSVC)
     if (CMAKE_CL_64)
         set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /bigobj")
     endif (CMAKE_CL_64)
+	
+	if (CMAKE_VERSION VERSION_GREATER 3.8)
+		set_target_properties(openmw-cs PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "$(TargetDir)")
+	endif (CMAKE_VERSION VERSION_GREATER 3.8)
 endif (MSVC)
 
 
diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index 89b94ce12..3ef62dfa3 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -215,6 +215,10 @@ if (MSVC)
     if (CMAKE_CL_64)
         set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /bigobj")
     endif (CMAKE_CL_64)
+	
+	if (CMAKE_VERSION VERSION_GREATER 3.8)
+		set_target_properties(openmw PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "$(TargetDir)")
+	endif (CMAKE_VERSION VERSION_GREATER 3.8)
 endif (MSVC)
 
 if (WIN32)
diff --git a/apps/openmw_test_suite/CMakeLists.txt b/apps/openmw_test_suite/CMakeLists.txt
index ea4b1209c..7d6898367 100644
--- a/apps/openmw_test_suite/CMakeLists.txt
+++ b/apps/openmw_test_suite/CMakeLists.txt
@@ -24,6 +24,12 @@ if (GTEST_FOUND)
     if (UNIX AND NOT APPLE)
         target_link_libraries(openmw_test_suite ${CMAKE_THREAD_LIBS_INIT})
     endif()
+	
+	if (MSVC)
+		if (CMAKE_VERSION VERSION_GREATER 3.8)
+			set_target_properties(openmw_test_suite PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "$(TargetDir)")
+		endif (CMAKE_VERSION VERSION_GREATER 3.8)
+	endif (MSVC)
 endif()
 
 
diff --git a/apps/wizard/CMakeLists.txt b/apps/wizard/CMakeLists.txt
index d2b9ab0f6..2d9a11c51 100644
--- a/apps/wizard/CMakeLists.txt
+++ b/apps/wizard/CMakeLists.txt
@@ -143,3 +143,9 @@ endif()
 if (WIN32)
     INSTALL(TARGETS openmw-wizard RUNTIME DESTINATION ".")
 endif(WIN32)
+
+if (MSVC)
+	if (CMAKE_VERSION VERSION_GREATER 3.8)
+		set_target_properties(openmw-wizard PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "$(TargetDir)")
+	endif (CMAKE_VERSION VERSION_GREATER 3.8)
+endif (MSVC)
\ No newline at end of file