diff --git a/polymer/eduke32/source/actors.c b/polymer/eduke32/source/actors.c
index 6386467e3..407763863 100644
--- a/polymer/eduke32/source/actors.c
+++ b/polymer/eduke32/source/actors.c
@@ -161,19 +161,18 @@ void addweapon( struct player_struct *p,short weapon)
     p->kickback_pic = 0;
 
     if(p->curr_weapon != weapon)
-    {
-        p->curr_weapon = weapon;
-
-        SetGameVarID(g_iWeaponVarID,p->curr_weapon, p->i, snum);
-        if(p->curr_weapon>=0)
-        {
-            SetGameVarID(g_iWorksLikeVarID,aplWeaponWorksLike[p->curr_weapon][snum], p->i, snum);
-        }
-        else
-        {
-            SetGameVarID(g_iWorksLikeVarID,-1, p->i, snum);
-        }
         OnEvent(EVENT_CHANGEWEAPON,p->i, snum, -1);
+
+    p->curr_weapon = weapon;
+
+    SetGameVarID(g_iWeaponVarID,p->curr_weapon, p->i, snum);
+    if(p->curr_weapon>=0)
+    {
+        SetGameVarID(g_iWorksLikeVarID,aplWeaponWorksLike[p->curr_weapon][snum], p->i, snum);
+    }
+    else
+    {
+        SetGameVarID(g_iWorksLikeVarID,-1, p->i, snum);
     }
 }
 
diff --git a/polymer/eduke32/source/gamedefs.h b/polymer/eduke32/source/gamedefs.h
index ca2a2a385..23693623c 100644
--- a/polymer/eduke32/source/gamedefs.h
+++ b/polymer/eduke32/source/gamedefs.h
@@ -130,7 +130,7 @@ extern "C" {
 
 // DEFAULT mouse sensitivity scale
 
-#define DEFAULTMOUSESENSITIVITY 10
+#define DEFAULTMOUSESENSITIVITY 18
 
 enum
    {