diff --git a/ChangeLog b/ChangeLog
index de71576bb..423d2e644 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-02-11  Elijah Newren  <newren gmail com>
+
+	* src/stack.h (enum MetaStackLayer):
+	* src/stack.c (get_standalone_layer):
+	actually use META_LAYER_TOP but just manually make it equal to
+	META_LAYER_DOCK.  Add a note point to the EWMH for why we do this.
+	#330717
+	
 2006-02-11  Elijah Newren  <newren gmail com>
 
 	* src/window.c (enum GnomeWinLayer): remove this legacy cruft that
diff --git a/src/stack.c b/src/stack.c
index b3bd203e7..bf834b4c7 100644
--- a/src/stack.c
+++ b/src/stack.c
@@ -292,7 +292,7 @@ get_standalone_layer (MetaWindow *window)
                                                 window->display->expected_focus_window))))
         layer = META_LAYER_FULLSCREEN;
       else if (window->wm_state_above)
-        layer = META_LAYER_DOCK;
+        layer = META_LAYER_TOP;
       else
         layer = META_LAYER_NORMAL;
       break;
diff --git a/src/stack.h b/src/stack.h
index 5449a24d5..831a19bfe 100644
--- a/src/stack.h
+++ b/src/stack.h
@@ -50,7 +50,7 @@ typedef enum
   META_LAYER_DESKTOP        = 0,
   META_LAYER_BOTTOM         = 1,
   META_LAYER_NORMAL         = 2,
-  META_LAYER_TOP            = 3,
+  META_LAYER_TOP            = 4, /* Same as DOCK; see EWMH and bug 330717 */
   META_LAYER_DOCK           = 4,
   META_LAYER_FULLSCREEN     = 5,
   META_LAYER_FOCUSED_WINDOW = 6,