diff --git a/src/games/tetris/variant_fp.c b/src/games/tetris/variant_fp.c
index 1410485..16ea462 100644
--- a/src/games/tetris/variant_fp.c
+++ b/src/games/tetris/variant_fp.c
@@ -32,6 +32,9 @@
 #include "variant_std.h"
 #include "variant_fp.h"
 
+#if (NUM_ROWS != NUM_COLS)
+		#error "First Person Tetris does not support non-square displays!"
+#endif
 
 /***************
  * entry point *
diff --git a/src/games/tetris/view.c b/src/games/tetris/view.c
index 71340b9..ba542d6 100644
--- a/src/games/tetris/view.c
+++ b/src/games/tetris/view.c
@@ -52,23 +52,8 @@
 /** color of line counter */
 #define TETRIS_VIEW_COLORCOUNTER 2
 
-
-#ifdef GAME_TETRIS_FP
-	#if NUM_ROWS < NUM_COLS
-		#define VIEWCOLS NUM_ROWS
-		#define VIEWROWS NUM_ROWS
-	#elif NUM_ROWS > NUM_COLS
-		#define VIEWCOLS NUM_COLS
-		#define VIEWROWS NUM_COLS
-	#else
-		#define VIEWCOLS NUM_COLS
-		#define VIEWROWS NUM_ROWS
-	#endif
-#else
-	#define VIEWCOLS NUM_COLS
-	#define VIEWROWS NUM_ROWS
-#endif
-
+#define VIEWCOLS NUM_COLS
+#define VIEWROWS NUM_ROWS
 
 #if VIEWROWS >= 20
 	#define TETRIS_VIEW_YOFFSET_DUMP         ((VIEWROWS - 20) / 2)