diff --git a/Casks/intellij-idea20161.rb b/Casks/intellij-idea20161.rb
index 09150590d..273b5fe36 100644
--- a/Casks/intellij-idea20161.rb
+++ b/Casks/intellij-idea20161.rb
@@ -11,15 +11,17 @@ cask 'intellij-idea20161' do
   app 'IntelliJ IDEA.app'
 
   uninstall_postflight do
-    ENV['PATH'].split(File::PATH_SEPARATOR).map { |path| File.join(path, 'idea') }.each { |path| File.delete(path) if File.exist?(path) }
+    ENV['PATH'].split(File::PATH_SEPARATOR).map { |path| File.join(path, 'idea') }.each { |path| File.delete(path) if File.exist?(path) && File.readlines(path).grep(%r{# see com.intellij.idea.SocketLock for the server side of this interface}).any? }
   end
 
   zap delete: [
                 "~/Library/Caches/IntelliJIdea#{version.major_minor}",
                 "~/Library/Logs/IntelliJIdea#{version.major_minor}",
+                '~/Library/Saved Application State/com.jetbrains.intellij.savedState',
+              ],
+      trash:  [
                 "~/Library/Application Support/IntelliJIdea#{version.major_minor}",
                 "~/Library/Preferences/IntelliJIdea#{version.major_minor}",
                 '~/Library/Preferences/com.jetbrains.intellij.plist',
-                '~/Library/Saved Application State/com.jetbrains.intellij.savedState',
               ]
 end