diff --git a/xs/src/slic3r/GUI/GUI.cpp b/xs/src/slic3r/GUI/GUI.cpp
index aad9702366..b00813a71b 100644
--- a/xs/src/slic3r/GUI/GUI.cpp
+++ b/xs/src/slic3r/GUI/GUI.cpp
@@ -607,7 +607,7 @@ void show_error(wxWindow* parent, const wxString& message) {
 
 void show_error_id(int id, const std::string& message) {
 	auto *parent = id != 0 ? wxWindow::FindWindowById(id) : nullptr;
-	show_error(parent, message);
+	show_error(parent, wxString::FromUTF8(message.data()));
 }
 
 void show_info(wxWindow* parent, const wxString& message, const wxString& title){
diff --git a/xs/src/slic3r/GUI/MsgDialog.cpp b/xs/src/slic3r/GUI/MsgDialog.cpp
index 6fba47a37f..58679ed9eb 100644
--- a/xs/src/slic3r/GUI/MsgDialog.cpp
+++ b/xs/src/slic3r/GUI/MsgDialog.cpp
@@ -71,11 +71,12 @@ ErrorDialog::ErrorDialog(wxWindow *parent, const wxString &msg) :
 	text->Wrap(CONTENT_WIDTH);
 	p_sizer->Add(text, 1, wxEXPAND);
 
-	panel->SetMinSize(wxSize(CONTENT_WIDTH, CONTENT_HEIGHT));
+	panel->SetMinSize(wxSize(CONTENT_WIDTH, 0));
 	panel->SetScrollRate(0, 5);
 
 	content_sizer->Add(panel, 1, wxEXPAND);
 
+	SetMaxSize(wxSize(-1, CONTENT_MAX_HEIGHT));
 	Fit();
 }
 
diff --git a/xs/src/slic3r/GUI/MsgDialog.hpp b/xs/src/slic3r/GUI/MsgDialog.hpp
index a011270238..2d570a0bf7 100644
--- a/xs/src/slic3r/GUI/MsgDialog.hpp
+++ b/xs/src/slic3r/GUI/MsgDialog.hpp
@@ -31,7 +31,7 @@ struct MsgDialog : wxDialog
 protected:
 	enum {
 		CONTENT_WIDTH = 500,
-		CONTENT_HEIGHT = 300,
+		CONTENT_MAX_HEIGHT = 600,
 		BORDER = 30,
 		VERT_SPACING = 15,
 		HORIZ_SPACING = 5,