diff --git a/base/qt/directories_dialog.py b/base/qt/directories_dialog.py
index a2c36a3a..587f5d54 100644
--- a/base/qt/directories_dialog.py
+++ b/base/qt/directories_dialog.py
@@ -10,14 +10,16 @@
 from PyQt4.QtCore import SIGNAL, Qt
 from PyQt4.QtGui import QDialog, QFileDialog, QHeaderView
 
-from directories_dialog_ui import Ui_DirectoriesDialog
-from directories_model import DirectoriesModel, DirectoriesDelegate
+from . import platform
+from .directories_dialog_ui import Ui_DirectoriesDialog
+from .directories_model import DirectoriesModel, DirectoriesDelegate
 
 class DirectoriesDialog(QDialog, Ui_DirectoriesDialog):
     def __init__(self, parent, app):
         flags = Qt.CustomizeWindowHint | Qt.WindowTitleHint | Qt.WindowSystemMenuHint
         QDialog.__init__(self, parent, flags)
         self.app = app
+        self.lastAddedFolder = platform.INITIAL_FOLDER_IN_DIALOGS
         self._setupUi()
         self._updateRemoveButton()
         
@@ -54,9 +56,10 @@ class DirectoriesDialog(QDialog, Ui_DirectoriesDialog):
     def addButtonClicked(self):
         title = u"Select a directory to add to the scanning list"
         flags = QFileDialog.ShowDirsOnly
-        dirpath = unicode(QFileDialog.getExistingDirectory(self, title, '', flags))
+        dirpath = unicode(QFileDialog.getExistingDirectory(self, title, self.lastAddedFolder, flags))
         if not dirpath:
             return
+        self.lastAddedFolder = dirpath
         self.app.add_directory(dirpath)
         self.directoriesModel.reset()
     
diff --git a/base/qt/platform.py b/base/qt/platform.py
index 98e612b7..5962018c 100644
--- a/base/qt/platform.py
+++ b/base/qt/platform.py
@@ -13,5 +13,7 @@ import sys
 
 if sys.platform == 'win32':
     from platform_win import *
+elif sys.platform == 'darwin':
+    from platform_osx import *
 else:
     pass # unsupported platform
diff --git a/base/qt/platform_osx.py b/base/qt/platform_osx.py
new file mode 100644
index 00000000..0385f8d4
--- /dev/null
+++ b/base/qt/platform_osx.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Created By: Virgil Dupras
+# Created On: 2009-10-14
+# $Id$
+# Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+# 
+# This software is licensed under the "HS" License as described in the "LICENSE" file, 
+# which should be included with this package. The terms are also available at 
+# http://www.hardcoded.net/licenses/hs_license
+
+# dummy unit to allow the app to run under OSX during development
+
+INITIAL_FOLDER_IN_DIALOGS = '/'
+
+def recycle_file(path):
+    pass
diff --git a/base/qt/platform_win.py b/base/qt/platform_win.py
index f1a777ae..ead79783 100644
--- a/base/qt/platform_win.py
+++ b/base/qt/platform_win.py
@@ -14,6 +14,8 @@ import logging
 
 import winshell
 
+INITIAL_FOLDER_IN_DIALOGS = 'C:\\'
+
 def recycle_file(path):
     try:
         winshell.delete_file(unicode(path), no_confirm=True, silent=True)