diff --git a/src/imlib.c b/src/imlib.c
index 10ab718a9b5ea16e0bfb58446943e483d1b359d4..58a8608907f721c93b3e71128b35fd3e84dbe65b 100644
--- a/src/imlib.c
+++ b/src/imlib.c
@@ -78,8 +78,8 @@ void init_xinerama(void)
 		XineramaQueryVersion(disp, &major, &minor);
 		xinerama_screens = XineramaQueryScreens(disp, &num_xinerama_screens);
 
-		if (getenv("XINERAMA_SCREEN"))
-			xinerama_screen = atoi(getenv("XINERAMA_SCREEN"));
+		if (opt.xinerama_index >= 0)
+			xinerama_screen = opt.xinerama_index;
 		else {
 			xinerama_screen = 0;
 			XQueryPointer(disp, root, &dw, &dw, &px, &py, &di, &di, &du);
diff --git a/src/keyevents.c b/src/keyevents.c
index 83fc358beadb2eafb8ada50310b05124b0d08115..4c1ed28e63b7c70eddf443b5caeb586c01a39455 100644
--- a/src/keyevents.c
+++ b/src/keyevents.c
@@ -731,9 +731,8 @@ void feh_event_handle_keypress(XEvent * ev)
 					break;
 				}
 			}
-			if (getenv("XINERAMA_SCREEN"))
-				curr_screen = xinerama_screen =
-					atoi(getenv("XINERAMA_SCREEN"));
+			if (opt.xinerama_index >= 0)
+				curr_screen = xinerama_screen = opt.xinerama_index;
 		}
 #endif				/* HAVE_LIBXINERAMA */
 		winwid->full_screen = !winwid->full_screen;
diff --git a/src/menu.c b/src/menu.c
index b8698ab973b4faff0a519572ef8a7a7c6393b677..33207672ecc1eb026c9781061f83179fca6a4c33 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -1154,9 +1154,8 @@ void feh_menu_cb_opt_fullscreen(feh_menu * m, feh_menu_item * i)
 			}
 
 		}
-		if (getenv("XINERAMA_SCREEN"))
-			curr_screen = xinerama_screen =
-				atoi(getenv("XINERAMA_SCREEN"));
+		if (opt.xinerama_index >= 0)
+			curr_screen = xinerama_screen = opt.xinerama_index;
 	}
 #endif				/* HAVE_LIBXINERAMA */
 
diff --git a/src/winwidget.c b/src/winwidget.c
index 65cefca8922bcc5b98e18320ca9bbe430562389d..8bf1dbb958c155fd6bf8517820fab8b0a52f55ec 100644
--- a/src/winwidget.c
+++ b/src/winwidget.c
@@ -826,8 +826,8 @@ void winwidget_resize(winwidget winwid, int w, int h)
 			}
 
 		}
-		if (getenv("XINERAMA_SCREEN"))
-			xinerama_screen = atoi(getenv("XINERAMA_SCREEN"));
+		if (opt.xinerama_index >= 0)
+			xinerama_screen = opt.xinerama_index;
 
 		scr_width = xinerama_screens[xinerama_screen].width;
 		scr_height = xinerama_screens[xinerama_screen].height;