--- old/src/java.desktop/share/classes/sun/awt/im/InputContext.java	2018-06-15 17:37:33.544231336 +0900
+++ new/src/java.desktop/share/classes/sun/awt/im/InputContext.java	2018-06-15 17:37:32.925243954 +0900
@@ -547,6 +547,8 @@
                 if (inputMethod instanceof InputMethodAdapter) {
                     ((InputMethodAdapter) inputMethod).setClientComponent(null);
                 }
+                if (null == currentClientComponent.getInputMethodRequests())
+                    wasCompositionEnabledSupported = false;
             }
             savedLocale = inputMethod.getLocale();
 
@@ -563,6 +565,7 @@
             enableClientWindowNotification(inputMethod, false);
             if (this == inputMethodWindowContext) {
                 inputMethod.hideWindows();
+                inputMethod.removeNotify();
                 inputMethodWindowContext = null;
             }
             inputMethodLocator = null;