diff --git a/source/BlockEntities/ChestEntity.cpp b/source/BlockEntities/ChestEntity.cpp
index 769fadc22..cd2b15e2b 100644
--- a/source/BlockEntities/ChestEntity.cpp
+++ b/source/BlockEntities/ChestEntity.cpp
@@ -110,7 +110,6 @@ void cChestEntity::UsedBy(cPlayer * a_Player)
 		if( a_Player->GetWindow() != GetWindow() )
 		{
 			a_Player->OpenWindow( GetWindow() );
-			GetWindow()->SendWholeWindow(*a_Player->GetClientHandle());
 		}
 	}
 
diff --git a/source/BlockEntities/DropSpenserEntity.cpp b/source/BlockEntities/DropSpenserEntity.cpp
index c0993d676..900ecb172 100644
--- a/source/BlockEntities/DropSpenserEntity.cpp
+++ b/source/BlockEntities/DropSpenserEntity.cpp
@@ -219,7 +219,6 @@ void cDropSpenserEntity::UsedBy(cPlayer * a_Player)
 		if (a_Player->GetWindow() != Window)
 		{
 			a_Player->OpenWindow(Window);
-			Window->SendWholeWindow(*a_Player->GetClientHandle());
 		}
 	}
 }
diff --git a/source/BlockEntities/FurnaceEntity.cpp b/source/BlockEntities/FurnaceEntity.cpp
index b199f480b..d4cdf3f89 100644
--- a/source/BlockEntities/FurnaceEntity.cpp
+++ b/source/BlockEntities/FurnaceEntity.cpp
@@ -88,7 +88,6 @@ void cFurnaceEntity::UsedBy(cPlayer * a_Player)
 		if (a_Player->GetWindow() != GetWindow())
 		{
 			a_Player->OpenWindow(GetWindow());
-			GetWindow()->SendWholeWindow(*a_Player->GetClientHandle());
 		}
 	}
 }
diff --git a/source/Player.cpp b/source/Player.cpp
index 254e58655..8970719f1 100644
--- a/source/Player.cpp
+++ b/source/Player.cpp
@@ -438,6 +438,7 @@ void cPlayer::OpenWindow(cWindow * a_Window)
 	CloseWindow();
 	a_Window->OpenedByPlayer(*this);
 	m_CurrentWindow = a_Window;
+	a_Window->SendWholeWindow(*GetClientHandle());
 }