diff --git a/dialogs.cpp b/dialogs.cpp
index 55f5349d..46db4c23 100644
--- a/dialogs.cpp
+++ b/dialogs.cpp
@@ -566,8 +566,10 @@ EX namespace dialog {
           else if(items[i].body == highlight_text) state = 1;
           }
       for(int i=0; i<isize(items); i++)
-        if(isitem(items[i])) 
+        if(isitem(items[i])) {
           highlight_text = items[i].body;
+          break;
+          }
       uni = sym = 0;
       }
     if(key_actions.count(uni)) {
diff --git a/hypgraph.cpp b/hypgraph.cpp
index 840ee8f6..b632ac5d 100644
--- a/hypgraph.cpp
+++ b/hypgraph.cpp
@@ -2226,6 +2226,7 @@ EX void draw_boundary(int w) {
 #endif
 
 EX void change_shift(shiftpoint& h, ld by) {
+  if(!by) return;
   h.shift += by;
   if((mdinf[pmodel].flags & mf::uses_bandshift) || (sphere && pmodel == mdSpiral)) {
     h.h = spin(pconf.model_orientation * degree) * h.h;
@@ -2240,6 +2241,7 @@ EX void change_shift(shiftpoint& h, ld by) {
   }
 
 EX void change_shift(shiftmatrix& T, ld by) {
+  if(!by) return;
   T.shift += by;
   if((mdinf[pmodel].flags & mf::uses_bandshift) || (sphere && pmodel == mdSpiral)) {
     T.T = spin(pconf.model_orientation * degree) * T.T;