diff --git a/src/nsfns.m b/src/nsfns.m
index 820254fa37d..051e5091919 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -983,8 +983,8 @@ Turn the input menu (an NSMenu) into a lisp list for tracking on lisp side
   x_set_icon_name,
   x_set_icon_type,
   x_set_internal_border_width, /* generic OK */
-  0, /* x_set_right_divider_width */
-  0, /* x_set_bottom_divider_width */
+  x_set_right_divider_width,
+  x_set_bottom_divider_width,
   x_set_menu_bar_lines,
   x_set_mouse_color,
   x_explicitly_set_name,
diff --git a/src/nsterm.m b/src/nsterm.m
index eba75f1b93f..4b887ec0b50 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -2955,10 +2955,11 @@ Note that CURSOR_WIDTH is meaningful only for (h)bar cursors.
   NSTRACE ("ns_draw_vertical_window_border");
 
   face = FACE_OPT_FROM_ID (f, VERTICAL_BORDER_FACE_ID);
-  if (face)
-      [ns_lookup_indexed_color(face->foreground, f) set];
 
   ns_focus (f, &r, 1);
+  if (face)
+    [ns_lookup_indexed_color(face->foreground, f) set];
+
   NSRectFill(r);
   ns_unfocus (f);
 }
@@ -2977,10 +2978,11 @@ Note that CURSOR_WIDTH is meaningful only for (h)bar cursors.
   NSTRACE ("ns_draw_window_divider");
 
   face = FACE_OPT_FROM_ID (f, WINDOW_DIVIDER_FACE_ID);
-  if (face)
-      [ns_lookup_indexed_color(face->foreground, f) set];
 
   ns_focus (f, &r, 1);
+  if (face)
+    [ns_lookup_indexed_color(face->foreground, f) set];
+
   NSRectFill(r);
   ns_unfocus (f);
 }