diff --git a/source/src/editing.cpp b/source/src/editing.cpp
index b047914a..3f7be35e 100644
--- a/source/src/editing.cpp
+++ b/source/src/editing.cpp
@@ -50,8 +50,13 @@ void toggleedit(bool force)
     selset = false;
     editing = editmode ? 1 : 0;
     player1->state = editing ? CS_EDITING : CS_ALIVE;
+    if(editing && player1->onladder) player1->onladder = false;
+    if(editing && (player1->weaponsel->type == GUN_SNIPER && ((sniperrifle *)player1->weaponsel)->scoped))
+    {
+        ((sniperrifle *)player1->weaponsel)->onownerdies(); // or ondeselecting()
+        addmsg(SV_SCOPE, "ri2", lastmillis, 0);
+    }
     if(!force) addmsg(SV_EDITMODE, "ri", editing);
-    // TODO (flowtron): if(editing && !_engine_knows_mappack_files_) get2knowMPfiles(); // MediaPack
 }
 
 void edittoggle() { toggleedit(false); }