diff --git a/ReSharper.FSharp/src/FSharp.Psi.Intentions/src/Intentions/GenerateSignatureFileAction.fs b/ReSharper.FSharp/src/FSharp.Psi.Intentions/src/Intentions/GenerateSignatureFileAction.fs
index b9776e088c..1021978d53 100644
--- a/ReSharper.FSharp/src/FSharp.Psi.Intentions/src/Intentions/GenerateSignatureFileAction.fs
+++ b/ReSharper.FSharp/src/FSharp.Psi.Intentions/src/Intentions/GenerateSignatureFileAction.fs
@@ -1,7 +1,9 @@
 namespace JetBrains.ReSharper.Plugins.FSharp.Psi.Features.ContextActions
 
-open System
 open System.IO
+open JetBrains.ProjectModel.ProjectsHost
+open JetBrains.RdBackend.Common.Features.ProjectModel
+open JetBrains.RdBackend.Common.Features.ProjectModel.View.Ordering
 open JetBrains.ReSharper.Feature.Services.ContextActions
 open JetBrains.ReSharper.Plugins.FSharp.Psi.Features.Intentions
 open type JetBrains.ReSharper.Psi.PsiSourceFileExtensions
@@ -20,22 +22,32 @@ type GenerateSignatureFileAction(dataProvider: FSharpContextActionDataProvider)
         not hasSignature
         
     override this.ExecutePsiTransaction(solution, _) =
-        let project = dataProvider.SourceFile.GetProject()
-        
+        let projectFile = dataProvider.SourceFile.ToProjectFile()
         let physicalPath = dataProvider.SourceFile.ToProjectFile().Location.FileAccessPath
-        let fsiFile = Path.ChangeExtension(physicalPath, ".fsi")        
-        let currentFSharpFile = dataProvider.PsiFile
-        let fcsService = currentFSharpFile.FcsCheckerService
-        let checkResult = fcsService.ParseAndCheckFile(currentFSharpFile.GetSourceFile(), "for signature file", true)
-        do
-            match checkResult with
-            | None -> ()
-            | Some { CheckResults = checkResult } ->
-            
-            match checkResult.GenerateSignature() with
-            | None -> ()
-            | Some signatureSourceText ->
-                let content = string signatureSourceText
-                File.WriteAllText(fsiFile, content)
+        let fsiFile = Path.ChangeExtension(physicalPath, ".fsi")
+        
+        try
+            let currentFSharpFile = dataProvider.PsiFile
+            let fcsService = currentFSharpFile.FcsCheckerService
+            let checkResult = fcsService.ParseAndCheckFile(currentFSharpFile.GetSourceFile(), "for signature file", true)
+            do
+                match checkResult with
+                | None -> ()
+                | Some { CheckResults = checkResult } ->
+                
+                match checkResult.GenerateSignature() with
+                | None -> ()
+                | Some signatureSourceText ->
+                    let content = string signatureSourceText
+                    File.WriteAllText(fsiFile, content)
+        with ex ->
+            // TODO: show some balloon thing?
+            ()
+
+        solution.InvokeUnderTransaction(fun transactionCookie ->
+            let virtualPath = FileSystemPath.TryParse(fsiFile).ToVirtualFileSystemPath()
+            let relativeTo = RelativeTo(projectFile, RelativeToType.Before)
+            transactionCookie.AddFile(projectFile.ParentFolder, virtualPath, context = OrderingContext(relativeTo))
+            |> ignore)
 
-        Action<_>(ignore)
\ No newline at end of file
+        null
\ No newline at end of file