diff --git a/src/jni_driver.cpp b/src/jni_driver.cpp
index 6eeb727a..d6380d2f 100644
--- a/src/jni_driver.cpp
+++ b/src/jni_driver.cpp
@@ -16,6 +16,9 @@ JavaVM* jvm = nullptr;
 
 #define AlberFunction(type, name) JNIEXPORT type JNICALL Java_com_panda3ds_pandroid_AlberDriver_##name
 
+#define MAKE_SETTING(functionName, type, settingName) \
+AlberFunction(void, functionName) (JNIEnv* env, jobject obj, type value) { emulator->getConfig().settingName = value; }
+
 void throwException(JNIEnv* env, const char* message) {
 	jclass exceptionClass = env->FindClass("java/lang/RuntimeException");
 	env->ThrowNew(exceptionClass, message);
@@ -35,6 +38,8 @@ JNIEnv* jniEnv() {
 
 extern "C" {
 
+MAKE_SETTING(setShaderJitEnabled, jboolean, shaderJitEnabled)
+
 AlberFunction(void, Setup)(JNIEnv* env, jobject obj) { env->GetJavaVM(&jvm); }
 AlberFunction(void, Pause)(JNIEnv* env, jobject obj) { emulator->pause(); }
 AlberFunction(void, Resume)(JNIEnv* env, jobject obj) { emulator->resume(); }
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/AlberDriver.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/AlberDriver.java
index 5cff703c..00b7842b 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/AlberDriver.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/AlberDriver.java
@@ -22,5 +22,7 @@ public class AlberDriver {
 	public static native void LoadLuaScript(String script);
 	public static native byte[] GetSmdh();
 
+	public static native void setShaderJitEnabled(boolean enable);
+
 	static { System.loadLibrary("Alber"); }
 }
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/DeveloperPreferences.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/DeveloperPreferences.java
index 0d15ba32..f131f0a0 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/DeveloperPreferences.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/DeveloperPreferences.java
@@ -20,6 +20,7 @@ public class DeveloperPreferences extends BasePreferenceFragment {
         setActivityTitle(R.string.developer_options);
 
         setItemClick("performanceMonitor", pref -> GlobalConfig.set(GlobalConfig.KEY_SHOW_PERFORMANCE_OVERLAY, ((SwitchPreference) pref).isChecked()));
+        setItemClick("shaderJit", pref -> GlobalConfig.set(GlobalConfig.KEY_SHADER_JIT, ((SwitchPreference) pref).isChecked()));
         setItemClick("loggerService", pref -> {
             boolean checked = ((SwitchPreference) pref).isChecked();
             Context ctx = PandroidApplication.getAppContext();
@@ -43,5 +44,6 @@ public class DeveloperPreferences extends BasePreferenceFragment {
     private void refresh() {
         ((SwitchPreference) findPreference("performanceMonitor")).setChecked(GlobalConfig.get(GlobalConfig.KEY_SHOW_PERFORMANCE_OVERLAY));
         ((SwitchPreference) findPreference("loggerService")).setChecked(GlobalConfig.get(GlobalConfig.KEY_LOGGER_SERVICE));
+        ((SwitchPreference) findPreference("shaderJit")).setChecked(GlobalConfig.get(GlobalConfig.KEY_SHADER_JIT));
     }
 }
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/config/GlobalConfig.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/config/GlobalConfig.java
index 38efdb20..bff1f9e0 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/config/GlobalConfig.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/config/GlobalConfig.java
@@ -18,6 +18,7 @@ public class GlobalConfig {
 
     public static DataModel data;
 
+    public static final Key<Boolean> KEY_SHADER_JIT = new Key<>("emu.shader_jit", false);
     public static final Key<Boolean> KEY_SHOW_PERFORMANCE_OVERLAY = new Key<>("dev.performanceOverlay", false);
     public static final Key<Boolean> KEY_LOGGER_SERVICE = new Key<>("dev.loggerService", false);
     public static final Key<Integer> KEY_APP_THEME = new Key<>("app.theme", THEME_ANDROID);
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlRenderer.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlRenderer.java
index 224bb080..329324e9 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlRenderer.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlRenderer.java
@@ -7,6 +7,7 @@ import android.graphics.Rect;
 import android.opengl.GLSurfaceView;
 import android.util.Log;
 import com.panda3ds.pandroid.AlberDriver;
+import com.panda3ds.pandroid.data.config.GlobalConfig;
 import com.panda3ds.pandroid.utils.Constants;
 import com.panda3ds.pandroid.utils.GameUtils;
 import com.panda3ds.pandroid.utils.PerformanceMonitor;
@@ -80,6 +81,7 @@ public class PandaGlRenderer implements GLSurfaceView.Renderer, ConsoleRenderer
 		glBindFramebuffer(GL_FRAMEBUFFER, 0);
 
 		AlberDriver.Initialize();
+		AlberDriver.setShaderJitEnabled(GlobalConfig.get(GlobalConfig.KEY_SHADER_JIT));
 		AlberDriver.LoadRom(romPath);
 
 		// Load the SMDH
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/utils/PerformanceView.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/utils/PerformanceView.java
index 7f712e4e..f355b030 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/utils/PerformanceView.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/utils/PerformanceView.java
@@ -11,6 +11,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.widget.AppCompatTextView;
 
+import com.panda3ds.pandroid.data.config.GlobalConfig;
 import com.panda3ds.pandroid.utils.PerformanceMonitor;
 
 public class PerformanceView extends AppCompatTextView {
@@ -46,7 +47,7 @@ public class PerformanceView extends AppCompatTextView {
 
         debug += "<b>FPS: </b>"+PerformanceMonitor.getFps()+"<br>";
         debug += "<b>RAM: </b>"+Math.round(((float) memoryUsageMb / memoryTotalMb)*100)+"%  ("+memoryUsageMb+"MB/"+memoryTotalMb+"MB)<br>";
-        debug += "<b>BACKEND: </b>"+PerformanceMonitor.getBackend()+"<br>";
+        debug += "<b>BACKEND: </b>"+PerformanceMonitor.getBackend()+(GlobalConfig.get(GlobalConfig.KEY_SHADER_JIT) ? " + JIT" : "")+"<br>";
         setText(Html.fromHtml(debug, Html.FROM_HTML_MODE_COMPACT));
         postDelayed(this::refresh, 250);
     }
diff --git a/src/pandroid/app/src/main/res/values-pt-rBR/strings.xml b/src/pandroid/app/src/main/res/values-pt-rBR/strings.xml
index aafe1810..788c25a6 100644
--- a/src/pandroid/app/src/main/res/values-pt-rBR/strings.xml
+++ b/src/pandroid/app/src/main/res/values-pt-rBR/strings.xml
@@ -51,4 +51,6 @@
     <string name="pref_performance_monitor_summary">Mostrar um overlay com fps, memoria, etc.</string>
     <string name="pref_logger_service_title">Depuração</string>
     <string name="pref_logger_service_summary">Grave os registros para um arquivo.</string>
+    <string name="pref_shader_jit_title">Shader Jit</string>
+    <string name="pref_shader_jit_summary">Usar recompilador de shaders</string>
 </resources>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/values/strings.xml b/src/pandroid/app/src/main/res/values/strings.xml
index baf89752..be6c36a8 100644
--- a/src/pandroid/app/src/main/res/values/strings.xml
+++ b/src/pandroid/app/src/main/res/values/strings.xml
@@ -52,4 +52,7 @@
     <string name="pref_performance_monitor_summary">Show overlay with fps, memory, etc.</string>
     <string name="pref_logger_service_title">Logger</string>
     <string name="pref_logger_service_summary">Store application logs to file.</string>
+    <string name="pref_shader_jit_title">Shader JIT</string>
+    <string name="pref_shader_jit_summary">Use shader re-compiler</string>
+    <string name="graphics">Graphics</string>
 </resources>
diff --git a/src/pandroid/app/src/main/res/xml/developer_preferences.xml b/src/pandroid/app/src/main/res/xml/developer_preferences.xml
index fae82279..96ce8906 100644
--- a/src/pandroid/app/src/main/res/xml/developer_preferences.xml
+++ b/src/pandroid/app/src/main/res/xml/developer_preferences.xml
@@ -14,4 +14,16 @@
         app:title="@string/pref_logger_service_title"
         android:summary="@string/pref_logger_service_summary"/>
 
+    <PreferenceCategory
+        app:iconSpaceReserved="false"
+        app:title="@string/graphics">
+
+        <SwitchPreference
+            app:key="shaderJit"
+            app:title="@string/pref_shader_jit_title"
+            app:summary="@string/pref_shader_jit_summary"
+            app:iconSpaceReserved="false"/>
+
+    </PreferenceCategory>
+
 </PreferenceScreen>
\ No newline at end of file