diff --git a/vp8/encoder/pickinter.c b/vp8/encoder/pickinter.c
index 8c6f7dda06376c89be9f60cc5cb8ebd72d316b3f..404a5bf6735c67841901154899f3c6b5a46ade84 100644
--- a/vp8/encoder/pickinter.c
+++ b/vp8/encoder/pickinter.c
@@ -519,6 +519,8 @@ void vp8_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset,
         if (skip_mode[x->e_mbd.mode_info_context->mbmi.ref_frame])
             continue;
 
+        this_mode = vp8_mode_order[mode_index];
+
 #if CONFIG_SEGFEATURES
         // Experimental use of Segment features.
         if ( xd->segmentation_enabled && !cm->refresh_alt_ref_frame )
@@ -575,8 +577,6 @@ void vp8_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset,
         rate2 = 0;
         distortion2 = 0;
 
-        this_mode = vp8_mode_order[mode_index];
-
         // Experimental debug code.
         //all_rds[mode_index] = -1;