diff --git a/org.eclipse.ote.ui.message/src/org/eclipse/ote/ui/message/watch/WatchView.java b/org.eclipse.ote.ui.message/src/org/eclipse/ote/ui/message/watch/WatchView.java
index 2c9ed8e..f68264e 100644
--- a/org.eclipse.ote.ui.message/src/org/eclipse/ote/ui/message/watch/WatchView.java
+++ b/org.eclipse.ote.ui.message/src/org/eclipse/ote/ui/message/watch/WatchView.java
@@ -593,7 +593,10 @@
             final FileDialog dialog = new FileDialog(treeViewer.getTree().getShell(), SWT.SAVE);
             dialog.setFilterExtensions(new String[] {"*.mwi"});
             if (saveFilePath == null) {
-               saveFilePath = OseeData.getPath().toOSString();
+               saveFilePath = System.getProperty("user.home");
+               if(saveFilePath == null) {
+                  saveFilePath = OseeData.getPath().toOSString();
+               }
             }
             if (lastSaveFileName == null) {
                lastSaveFileName = "msgWatchItems.mwi";