diff --git a/luke.bat b/luke.bat
index 0142a53..b3911e1 100644
--- a/luke.bat
+++ b/luke.bat
@@ -1,3 +1,10 @@
 @echo off
-set JAVA_OPTIONS=-Xmx1024m -Xms512m -XX:MaxMetaspaceSize=256m
+set ADD_OPENS_OPTION=--add-opens java.base/java.lang=ALL-UNNAMED
+java %ADD_OPENS_OPTION% -version > nul 2>&1
+if %errorlevel% equ 0 (
+    rem running on jdk9+
+    set JAVA_OPTIONS=%ADD_OPENS_OPTION%
+)
+
+set JAVA_OPTIONS=%JAVA_OPTIONS% -Xmx1024m -Xms512m -XX:MaxMetaspaceSize=256m
 start javaw %JAVA_OPTIONS% -Dswing.systemlaf=com.jgoodies.looks.plastic.PlasticXPLookAndFeel -jar .\target\luke-swing-with-deps.jar
diff --git a/luke.sh b/luke.sh
index c122535..ab65427 100755
--- a/luke.sh
+++ b/luke.sh
@@ -1,11 +1,21 @@
 #!/bin/bash
 
-JAVA_OPTIONS="-Xmx1024m -Xms512m -XX:MaxMetaspaceSize=256m"
+ADD_OPENS_OPTION="--add-opens java.base/java.lang=ALL-UNNAMED"
+java ${ADD_OPENS_OPTION} -version > /dev/null 2>&1
+if [ $? -eq 0 ]; then
+  # running on jdk9+
+  JAVA_OPTIONS="${ADD_OPENS_OPTION}"
+else
+  # running on jdk8
+  JAVA_OPTIONS=""
+fi
+
+JAVA_OPTIONS="${JAVA_OPTIONS} -Xmx1024m -Xms512m -XX:MaxMetaspaceSize=256m"
 JAR_FILE="target/luke-swing-with-deps.jar"
-if [[ ! -d `echo $LUKE_PATH` ]]; then
+if [[ ! -d `echo ${LUKE_PATH}` ]]; then
   LUKE_PATH=$(cd $(dirname $0) && pwd)
   echo "Unable to find the LUKE_PATH environnement variable."
-  echo "Set LUKE_PATH to $LUKE_PATH"
+  echo "Set LUKE_PATH to ${LUKE_PATH}"
 fi
 
 cd ${LUKE_PATH}
diff --git a/src/main/java/org/apache/lucene/luke/app/desktop/components/SearchPanelProvider.java b/src/main/java/org/apache/lucene/luke/app/desktop/components/SearchPanelProvider.java
index ff84271..40be92d 100644
--- a/src/main/java/org/apache/lucene/luke/app/desktop/components/SearchPanelProvider.java
+++ b/src/main/java/org/apache/lucene/luke/app/desktop/components/SearchPanelProvider.java
@@ -456,7 +456,6 @@ private void enableTermQuery() {
     tabbedPane.setEnabledAt(Tab.QPARSER.index(), false);
     tabbedPane.setEnabledAt(Tab.ANALYZER.index(), false);
     tabbedPane.setEnabledAt(Tab.SIMILARITY.index(), false);
-    tabbedPane.setEnabledAt(Tab.MLT.index(), false);
     if (tabbedPane.getSelectedIndex() == Tab.QPARSER.index() ||
         tabbedPane.getSelectedIndex() == Tab.ANALYZER.index() ||
         tabbedPane.getSelectedIndex() == Tab.SIMILARITY.index() ||
@@ -473,7 +472,6 @@ private void disableTermQuery() {
     tabbedPane.setEnabledAt(Tab.QPARSER.index(), true);
     tabbedPane.setEnabledAt(Tab.ANALYZER.index(), true);
     tabbedPane.setEnabledAt(Tab.SIMILARITY.index(), true);
-    tabbedPane.setEnabledAt(Tab.MLT.index(), true);
     parseBtn.setEnabled(true);
     rewriteCB.setEnabled(true);
     mltBtn.setEnabled(true);