diff --git a/AgileWorks/AgileWorks/WebView/View/WebViewController.swift b/AgileWorks/AgileWorks/WebView/View/WebViewController.swift
index 676bc2f490a47b7a286fc2b78e247419c8420a7b..6a2d4f43c297a0419e8a6d545f1facccfc080e22 100644
--- a/AgileWorks/AgileWorks/WebView/View/WebViewController.swift
+++ b/AgileWorks/AgileWorks/WebView/View/WebViewController.swift
@@ -333,7 +333,11 @@ class WebViewController: UIViewController {
     }
 
     @IBAction private func closeTapped() {
-        self.dismiss(animated: true, completion: nil)
+        if subViewStack.pop() == nil {
+            if self.showNotification {
+                self.dismiss(animated: true, completion: nil)
+            }
+        }
     }
 
     // 接続確認ボタンタップ処理
@@ -418,6 +422,11 @@ extension WebViewController: WKUIDelegate {
             subWebView.navigationDelegate = self
             subViewStack.push(subWebView, superView: mainWebView)
             subWebView.load(navigationAction.request)
+            
+            //キャンセルボタンの表示
+            self.closeButton.title = getDisplayString(key: "Close", comment: "")
+            self.closeButton.isEnabled = true
+            
             return subWebView
         }
         return nil
@@ -543,9 +552,6 @@ extension WebViewController: WKNavigationDelegate {
                     return
                 }
                 DispatchQueue.main.async {[self] in
-                    subViewStack.pop()
-                    subWebView = WKWebView(frame: self.formView.bounds, configuration: WKWebViewConfiguration())
-                    subViewStack.push(subWebView, superView: mainWebView)
                     self.subWebView.loadFileURL(tempPath, allowingReadAccessTo: tempPath)
                 }
             }.resume()
@@ -566,7 +572,11 @@ extension WebViewController: WKNavigationDelegate {
 extension WebViewController: SubViewStackEventDelegate {
     func onClose(webView: WKWebView, stack: SubViewStack) {
         if stack.isEmpty {
-            //closeButton.title = localizadStrings(key: "Close", comment: "")
+            if !self.showNotification {
+                //キャンセルボタン非表示
+                self.closeButton.title = ""
+                self.closeButton.isEnabled = false
+            }
         }
     }
 }