diff --git a/onionshare_gui/onionshare_gui.py b/onionshare_gui/onionshare_gui.py
index b58441d3..05305027 100644
--- a/onionshare_gui/onionshare_gui.py
+++ b/onionshare_gui/onionshare_gui.py
@@ -8,6 +8,16 @@ print "after path change"
 import onionshare
 import webapp
 
+onionshare_gui_dir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
+
+try:
+    import onionshare
+except ImportError:
+    sys.path.append(os.path.abspath(onionshare_gui_dir+"/.."))
+    import onionshare
+
+import webapp
+
 window_icon = None
 
 class Application(QApplication):
@@ -83,8 +93,7 @@ def main():
         return
 
     # create the onionshare icon
-    global window_icon
-    onionshare_gui_dir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
+    global window_icon, onionshare_gui_dir
     window_icon = QIcon("{0}/onionshare-icon.png".format(onionshare_gui_dir))
 
     # try starting hidden service