diff --git a/src/osdep/gui/PanelConfig.cpp b/src/osdep/gui/PanelConfig.cpp
index c7b60627..f1d79eb2 100644
--- a/src/osdep/gui/PanelConfig.cpp
+++ b/src/osdep/gui/PanelConfig.cpp
@@ -249,7 +249,7 @@ bool LoadConfigByName(const char *name)
 		lblName->setSize(lblName->getWidth(), lblName->getHeight());
 		lblName->setAlignment(gcn::Graphics::RIGHT);
 		txtName = new gcn::TextField();
-		txtName->setSize(300, txtName->getHeight());
+		txtName->setSize(300, TEXTFIELD_HEIGHT);
 		txtName->setId("ConfigName");
 		txtName->setBackgroundColor(colTextboxBackground);
 
@@ -257,7 +257,7 @@ bool LoadConfigByName(const char *name)
 		lblDesc->setSize(lblDesc->getWidth(), lblDesc->getHeight());
 		lblDesc->setAlignment(gcn::Graphics::RIGHT);
 		txtDesc = new gcn::TextField();
-		txtDesc->setSize(300, txtDesc->getHeight());
+		txtDesc->setSize(300, TEXTFIELD_HEIGHT);
 		txtDesc->setId("ConfigDesc");
 		txtDesc->setBackgroundColor(colTextboxBackground);
 
diff --git a/src/osdep/gui/PanelMisc.cpp b/src/osdep/gui/PanelMisc.cpp
index f8cd138d..5f21b15a 100644
--- a/src/osdep/gui/PanelMisc.cpp
+++ b/src/osdep/gui/PanelMisc.cpp
@@ -233,7 +233,7 @@ void InitPanelMisc(const struct _ConfigCategory& category)
 	lblOpenGUI->setAlignment(gcn::Graphics::RIGHT);
 	txtOpenGUI = new gcn::TextField();
 	txtOpenGUI->setEnabled(false);
-	txtOpenGUI->setSize(85, txtOpenGUI->getHeight());
+	txtOpenGUI->setSize(85, TEXTFIELD_HEIGHT);
 	txtOpenGUI->setBackgroundColor(colTextboxBackground);
 	cmdOpenGUI = new gcn::Button("...");
 	cmdOpenGUI->setId("OpenGUI");
@@ -245,7 +245,7 @@ void InitPanelMisc(const struct _ConfigCategory& category)
 	lblKeyForQuit->setAlignment(gcn::Graphics::RIGHT);
 	txtKeyForQuit = new gcn::TextField();
 	txtKeyForQuit->setEnabled(false);
-	txtKeyForQuit->setSize(85, txtKeyForQuit->getHeight());
+	txtKeyForQuit->setSize(85, TEXTFIELD_HEIGHT);
 	txtKeyForQuit->setBackgroundColor(colTextboxBackground);
 	cmdKeyForQuit = new gcn::Button("...");
 	cmdKeyForQuit->setId("KeyForQuit");
diff --git a/src/osdep/gui/PanelPaths.cpp b/src/osdep/gui/PanelPaths.cpp
index b053dd74..bacd8e9e 100644
--- a/src/osdep/gui/PanelPaths.cpp
+++ b/src/osdep/gui/PanelPaths.cpp
@@ -119,7 +119,7 @@ void InitPanelPaths(const struct _ConfigCategory& category)
 
 	lblSystemROMs = new gcn::Label("System ROMs:");
 	txtSystemROMs = new gcn::TextField();
-	txtSystemROMs->setSize(textFieldWidth, txtSystemROMs->getHeight());
+	txtSystemROMs->setSize(textFieldWidth, TEXTFIELD_HEIGHT);
 	txtSystemROMs->setBackgroundColor(colTextboxBackground);
 
 	cmdSystemROMs = new gcn::Button("...");
@@ -130,7 +130,7 @@ void InitPanelPaths(const struct _ConfigCategory& category)
 
 	lblConfigPath = new gcn::Label("Configuration files:");
 	txtConfigPath = new gcn::TextField();
-	txtConfigPath->setSize(textFieldWidth, txtConfigPath->getHeight());
+	txtConfigPath->setSize(textFieldWidth, TEXTFIELD_HEIGHT);
 	txtConfigPath->setBackgroundColor(colTextboxBackground);
 
 	cmdConfigPath = new gcn::Button("...");
@@ -141,7 +141,7 @@ void InitPanelPaths(const struct _ConfigCategory& category)
 
 	lblControllersPath = new gcn::Label("Controller files:");
 	txtControllersPath = new gcn::TextField();
-	txtControllersPath->setSize(textFieldWidth, txtControllersPath->getHeight());
+	txtControllersPath->setSize(textFieldWidth, TEXTFIELD_HEIGHT);
 	txtControllersPath->setBackgroundColor(colTextboxBackground);
 
 	cmdControllersPath = new gcn::Button("...");
@@ -152,7 +152,7 @@ void InitPanelPaths(const struct _ConfigCategory& category)
 
 	lblRetroArchFile = new gcn::Label("RetroArch configuration file (retroarch.cfg):");
 	txtRetroArchFile = new gcn::TextField();
-	txtRetroArchFile->setSize(textFieldWidth, txtRetroArchFile->getHeight());
+	txtRetroArchFile->setSize(textFieldWidth, TEXTFIELD_HEIGHT);
 	txtRetroArchFile->setBackgroundColor(colTextboxBackground);
 
 	cmdRetroArchFile = new gcn::Button("...");
diff --git a/src/osdep/gui/gui_handling.h b/src/osdep/gui/gui_handling.h
index c2607ef7..dfe4b672 100644
--- a/src/osdep/gui/gui_handling.h
+++ b/src/osdep/gui/gui_handling.h
@@ -13,9 +13,9 @@
 #define SMALL_BUTTON_WIDTH 30
 #define SMALL_BUTTON_HEIGHT 22
 #define LABEL_HEIGHT 15
-#define TEXTFIELD_HEIGHT 16
-#define DROPDOWN_HEIGHT 15
-#define SLIDER_HEIGHT 18
+#define TEXTFIELD_HEIGHT 20
+#define DROPDOWN_HEIGHT 20
+#define SLIDER_HEIGHT 20
 #define TITLEBAR_HEIGHT 24
 #ifdef USE_SDL2
 #include <guisan/sdl/sdlinput.hpp>