diff --git a/install/osx_scripts/onionshare b/install/osx_scripts/onionshare
index 7253b06a..f2cdb40c 100755
--- a/install/osx_scripts/onionshare
+++ b/install/osx_scripts/onionshare
@@ -19,8 +19,12 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 import zipimport, os, inspect
-cwd = os.path.dirname(os.path.realpath(os.path.abspath(inspect.getfile(inspect.currentframe()))))
-os.chdir(cwd)
+
+original_cwd = os.getcwd()
+new_cwd = os.path.dirname(os.path.realpath(os.path.abspath(inspect.getfile(inspect.currentframe()))))
+os.chdir(new_cwd)
+
 zi = zipimport.zipimporter('lib/python2.7/site-packages.zip')
 onionshare = zi.load_module('onionshare')
-onionshare.main()
+
+onionshare.main(original_cwd)
diff --git a/onionshare/onionshare.py b/onionshare/onionshare.py
index e3df8ed7..2e948c76 100644
--- a/onionshare/onionshare.py
+++ b/onionshare/onionshare.py
@@ -253,8 +253,14 @@ def tails_root():
             time.sleep(1)
 
 
-def main():
+def main(cwd=None):
     strings.load_strings()
+
+    # onionshare CLI in OSX needs to change current working directory (#132)
+    if helpers.get_platform() == 'Darwin':
+        if cwd:
+            os.chdir(cwd)
+
     tails_root()
 
     # parse arguments