diff --git a/codepot/src/codepot/views/wiki_editx.php b/codepot/src/codepot/views/wiki_editx.php
index e92e8295..11c332ec 100644
--- a/codepot/src/codepot/views/wiki_editx.php
+++ b/codepot/src/codepot/views/wiki_editx.php
@@ -61,13 +61,14 @@ function resize_editor()
 
 	var titleband = $("#wiki_edit_title_band");
 	var toolbar = $("#medium-editor-toolbar-1");
+	var toolbar_container = $("#wiki_edit_toolbar");
 	var files = $("#wiki_edit_files");
 	var footer = $("#codepot_footer");
-	var editor_container = $("#wiki_edit_result");
 
 	var ioff = titleband.offset();
 	var foff = footer.offset();
 
+	toolbar_container.innerHeight (toolbar.innerHeight());
 	ioff.top += titleband.outerHeight() + files.outerHeight() + toolbar.outerHeight() + 10;
 
 	editor.offset (ioff);
diff --git a/codepot/src/css/wiki.css b/codepot/src/css/wiki.css
index ab717c3c..69f44a31 100644
--- a/codepot/src/css/wiki.css
+++ b/codepot/src/css/wiki.css
@@ -28,6 +28,7 @@
 	overflow: visible !important;
 	margin: 0.2em 0 0.2em 0;
 	width: 100%;
+	clear: both;
 }
 
 #wiki_edit_toolbar {
@@ -36,6 +37,7 @@
 	width: 100%;
 	margin: 0.2em 0 0 0;
 	padding: 0;
+	clear: both;
 }
 
 #wiki_edit_toolbar .medium-editor-toolbar {