diff --git a/plugins/osx/osx.plugin.zsh b/plugins/osx/osx.plugin.zsh
index d75dbff7d..6700c0010 100644
--- a/plugins/osx/osx.plugin.zsh
+++ b/plugins/osx/osx.plugin.zsh
@@ -1,9 +1,6 @@
-function savepath() {
-  pwd > ~/.current_path~
-}
+
 
 function tab() {
-savepath
 osascript >/dev/null <<EOF
     tell application "System Events"
       tell process "Terminal" to keystroke "t" using command down
@@ -19,6 +16,7 @@ EOF
 
 
 function ntab() {
+
 if [[ $# == 0 ]]; then
       ThisDirectory=$PWD
 elif [[ $# == 1 && -d "$1" ]]; then
@@ -28,25 +26,38 @@ else
       return 1
 fi
 
-osascript <<-eof
- tell app "Finder"
- activate
-tell application "iTerm"
-	-- make new terminal
-	tell the front terminal 
-		activate current session
-		launch session "Default Session"
-		tell the current session
-			write text "cd \"$ThisDirectory\""
-		end tell
-	end tell
-end tell
-tell application "Finder"
-	activate
-end tell
-tell application "iTerm"
-	activate
-end tell
- end tell
-eof
-}
\ No newline at end of file
+
+if [[  $TERM_PROGRAM != iTerm.app ]]; then
+   
+  osascript -e "tell application \"System Events\"
+          tell process \"Terminal\" to keystroke \"t\" using command down
+        end
+        tell application \"Terminal\"
+          activate
+          do script with command \"cd \\\"$ThisDirectory\\\"\" in window 1
+        end tell"
+          return 1
+else     
+    osascript -e "  tell app \"Finder\"
+         activate
+            tell application \"iTerm\"
+    	-- make new terminal
+        	    tell the front terminal 
+        		    activate current session
+            		launch session \"Default Session\"
+            		tell the current session
+            			write text \"cd \\\"$ThisDirectory\\\"\"
+            		end tell
+            	end tell
+            end tell
+        tell application \"Finder\"
+        	activate
+        end tell
+        tell application \"iTerm\"
+        	activate
+        end tell
+     end tell"
+    
+fi
+
+    }