diff --git a/src/app/edit-session.coffee b/src/app/edit-session.coffee
index 1515d6aa4..262607744 100644
--- a/src/app/edit-session.coffee
+++ b/src/app/edit-session.coffee
@@ -123,10 +123,10 @@ class EditSession
     @buffer.change([[bufferRow, 0], [bufferRow, currentIndentString.length]], newIndentString)
 
   indentLevelForLine: (line) ->
-    if @softTabs
-      line.match(/^\s*/)?[0].length / @tabLength
-    else
+    if line.match(/^\t/)
       line.match(/^\t*/)?[0].length
+    else
+      line.match(/^\s*/)?[0].length / @tabLength
 
   buildIndentString: (number) ->
     if @softTabs