diff --git a/main/ui/src/main/resources/css/dark_theme.css b/main/ui/src/main/resources/css/dark_theme.css
index eb1191852..c277fc09f 100644
--- a/main/ui/src/main/resources/css/dark_theme.css
+++ b/main/ui/src/main/resources/css/dark_theme.css
@@ -465,6 +465,42 @@
 	-fx-padding: 4px 6px 4px 0;
 }
 
+/*******************************************************************************
+ *                                                                             *
+ * Text Areas                                                                  *
+ *                                                                             *
+ ******************************************************************************/
+
+.text-area {
+    -fx-cursor: default;
+	-fx-background-color: CONTROL_BORDER_NORMAL, CONTROL_BG_NORMAL;
+	-fx-background-insets: 0, 1px;
+	-fx-background-radius: 4px;
+	-fx-padding: 0;
+}
+
+.text-input:focused {
+	-fx-background-color: CONTROL_BORDER_FOCUSED, CONTROL_BG_NORMAL;
+}
+
+.text-input:disabled {
+	-fx-text-fill: TEXT_FILL_SECONDARY;
+	-fx-background-color: CONTROL_BORDER_DISABLED, CONTROL_BG_DISABLED;
+}
+
+.text-area > .scroll-pane > .scroll-bar {
+    -fx-padding: 2px;
+}
+
+.text-area .content {
+	-fx-padding: 0.2em 0.5em 0.2em 0.5em;
+	-fx-cursor: text;
+	-fx-text-fill: TEXT_FILL;
+	-fx-highlight-fill: PRIMARY_BG;
+	-fx-prompt-text-fill: TEXT_FILL_SECONDARY;
+    -fx-background-color: null;
+}
+
 /*******************************************************************************
  *                                                                             *
  * Buttons                                                                     *
diff --git a/main/ui/src/main/resources/css/light_theme.css b/main/ui/src/main/resources/css/light_theme.css
index 40b067d5d..a4ad762ed 100644
--- a/main/ui/src/main/resources/css/light_theme.css
+++ b/main/ui/src/main/resources/css/light_theme.css
@@ -465,6 +465,42 @@
 	-fx-padding: 4px 6px 4px 0;
 }
 
+/*******************************************************************************
+ *                                                                             *
+ * Text Areas                                                                  *
+ *                                                                             *
+ ******************************************************************************/
+
+.text-area {
+    -fx-cursor: default;
+	-fx-background-color: CONTROL_BORDER_NORMAL, CONTROL_BG_NORMAL;
+	-fx-background-insets: 0, 1px;
+	-fx-background-radius: 4px;
+	-fx-padding: 0;
+}
+
+.text-input:focused {
+	-fx-background-color: CONTROL_BORDER_FOCUSED, CONTROL_BG_NORMAL;
+}
+
+.text-input:disabled {
+	-fx-text-fill: TEXT_FILL_SECONDARY;
+	-fx-background-color: CONTROL_BORDER_DISABLED, CONTROL_BG_DISABLED;
+}
+
+.text-area > .scroll-pane > .scroll-bar {
+    -fx-padding: 2px;
+}
+
+.text-area .content {
+	-fx-padding: 0.2em 0.5em 0.2em 0.5em;
+	-fx-cursor: text;
+	-fx-text-fill: TEXT_FILL;
+	-fx-highlight-fill: PRIMARY_BG;
+	-fx-prompt-text-fill: TEXT_FILL_SECONDARY;
+    -fx-background-color: null;
+}
+
 /*******************************************************************************
  *                                                                             *
  * Buttons                                                                     *
diff --git a/main/ui/src/main/resources/fxml/recoverykey_display.fxml b/main/ui/src/main/resources/fxml/recoverykey_display.fxml
index 464eae6d7..d5f888398 100644
--- a/main/ui/src/main/resources/fxml/recoverykey_display.fxml
+++ b/main/ui/src/main/resources/fxml/recoverykey_display.fxml
@@ -3,7 +3,7 @@
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.ButtonBar?>
-<?import javafx.scene.control.TextField?>
+<?import javafx.scene.control.TextArea?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.StackPane?>
 <?import javafx.scene.layout.VBox?>
@@ -15,6 +15,7 @@
 	  minWidth="400"
 	  maxWidth="400"
 	  minHeight="145"
+	  maxHeight="180"
 	  spacing="12"
 	  alignment="TOP_CENTER">
 	<padding>
@@ -28,7 +29,7 @@
 			</StackPane>
 			
 			<!-- TODO use TextArea instead -->
-			<TextField editable="false" text="${controller.recoveryKey}" HBox.hgrow="ALWAYS"/>
+			<TextArea editable="false" text="${controller.recoveryKey}" wrapText="true"  HBox.hgrow="ALWAYS"/>
 		</HBox>
 
 		<VBox alignment="BOTTOM_CENTER" VBox.vgrow="ALWAYS">