diff --git a/gpttype_adapter.cpp b/gpttype_adapter.cpp
index 5115cd226..309141de7 100644
--- a/gpttype_adapter.cpp
+++ b/gpttype_adapter.cpp
@@ -5431,7 +5431,7 @@ generation_outputs gpttype_generate(const generation_inputs inputs)
                     }
                 }
             }
-            if(triggerff && kcpp_data->use_contextshift && (file_format == FileFormat::GGUF_GENERIC))
+            if(triggerff && kcpp_data->use_contextshift && (file_format == FileFormat::GGUF_GENERIC) && !media_data_changed)
             {
                 DoContextShifting(llama_ctx_v4, draft_ctx, current_context_tokens, embd_inp, inputs.max_length, nctx, false);
                 triggersc = false;
diff --git a/koboldcpp.py b/koboldcpp.py
index a9ba05964..03920d813 100644
--- a/koboldcpp.py
+++ b/koboldcpp.py
@@ -8731,8 +8731,6 @@ def show_gui():
     # refresh
     runopts_var.trace_add("write", changerunmode)
     changerunmode(1,1,1)
-    global runmode_untouched
-    runmode_untouched = True
     togglerope(1,1,1)
     toggleflashattn(1,1,1)
     togglectxshift(1,1,1)
@@ -8743,6 +8741,8 @@ def show_gui():
     toggleadmin(1,1,1)
     updatejinjathinktoggle(1,1,1)
     togglerpcmode(1,1,1)
+    global runmode_untouched
+    runmode_untouched = True
 
     # launch
     def guilaunch():